changefile remove silent on bash test

int int
2017-07-13 16:47:19 -04:00 · 2017-07-13 16:47:19 -04:00 · 463f2dca30
parent 7bdf44c987
commit 463f2dca30
2 changed files with 3 additions and 7 deletions
--- a/6
+++ b/6
@ -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
--- 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
 }