Merge pull request #636 from Bytom/fix-bytomcli-bugs

author Paladz <yzhu101@uottawa.ca>

Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)

committer GitHub <noreply@github.com>

Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)
author Paladz <yzhu101@uottawa.ca>
Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)
committer GitHub <noreply@github.com>
Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)
diff --cc cmd/bytomcli/commands/account.go
Simple merge
diff --cc cmd/bytomcli/commands/transaction.go
Simple merge
author	Paladz <yzhu101@uottawa.ca>
	Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)
committer	GitHub <noreply@github.com>
	Mon, 16 Apr 2018 11:46:09 +0000 (19:46 +0800)
		1	2
cmd/bytomcli/commands/account.go	patch \|	diff1 \|	diff2 \|	blob \| history
cmd/bytomcli/commands/transaction.go	patch \|	diff1 \|	diff2 \|	blob \| history