From 463f2dca30c6bed6c3adee69c10331d064832526 Mon Sep 17 00:00:00 2001
From: rigel rozanski <rigel.rozanski@gmail.com>
Date: Thu, 13 Jul 2017 16:47:19 -0400
Subject: [PATCH] changefile remove silent on bash test

int

int
---
 Makefile                                              | 6 +++---
 docs/guide/counter/cmd/countercli/commands/counter.go | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 143395559e..84c4e11f40 100644
--- a/Makefile
+++ b/Makefile
@@ -27,9 +27,9 @@ test_unit:
 
 test_cli: tests/cli/shunit2
 	# sudo apt-get install jq
-	@./tests/cli/basictx.sh
-	@./tests/cli/counter.sh
-	@./tests/cli/restart.sh
+	./tests/cli/basictx.sh
+	./tests/cli/counter.sh
+	./tests/cli/restart.sh
 	# @./tests/cli/ibc.sh
 
 test_tutorial: docs/guide/shunit2
diff --git a/docs/guide/counter/cmd/countercli/commands/counter.go b/docs/guide/counter/cmd/countercli/commands/counter.go
index 0e340d01f0..8364f41cbd 100644
--- a/docs/guide/counter/cmd/countercli/commands/counter.go
+++ b/docs/guide/counter/cmd/countercli/commands/counter.go
@@ -83,10 +83,6 @@ func readCounterTxFlags() (tx basecoin.Tx, err error) {
 		return tx, err
 	}
 
-<<<<<<< HEAD
-	tx = counter.NewTx(viper.GetBool(FlagValid), feeCoins, viper.GetInt(bcmd.FlagSequence))
-=======
 	tx = counter.NewTx(viper.GetBool(FlagValid), feeCoins)
->>>>>>> working sequence number with errors
 	return tx, nil
 }