Merge pull request #1666 from Bytom/dev

author Paladz <yzhu101@uottawa.ca>

Mon, 1 Apr 2019 01:54:53 +0000 (09:54 +0800)

committer GitHub <noreply@github.com>

Mon, 1 Apr 2019 01:54:53 +0000 (09:54 +0800)
author Paladz <yzhu101@uottawa.ca>
Mon, 1 Apr 2019 01:54:53 +0000 (09:54 +0800)
committer GitHub <noreply@github.com>
Mon, 1 Apr 2019 01:54:53 +0000 (09:54 +0800)
diff --cc account/accounts.go
Simple merge
diff --cc wallet/recovery.go
Simple merge
diff --cc wallet/recovery_test.go
Simple merge
diff --cc wallet/wallet.go
Simple merge
author	Paladz <yzhu101@uottawa.ca>
	Mon, 1 Apr 2019 01:54:53 +0000 (09:54 +0800)
committer	GitHub <noreply@github.com>
	Mon, 1 Apr 2019 01:54:53 +0000 (09:54 +0800)
		1	2
account/accounts.go	patch \|	diff1 \|	diff2 \|	blob \| history
wallet/recovery.go	patch \|	diff1 \|	diff2 \|	blob \| history
wallet/recovery_test.go	patch \|	diff1 \|	diff2 \|	blob \| history
wallet/wallet.go	patch \|	diff1 \|	diff2 \|	blob \| history