changefile remove silent on bash test

int int
2017-07-18 12:08:28 +02:00
parent 7bdf44c987
commit 463f2dca30
2 changed files with 3 additions and 7 deletions
@@ -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
 }