Merge commit 'refs/pull/146/head' of github.com:bitcoindevkit/bdk

author Alekos Filini <alekos.filini@gmail.com>

Thu, 29 Oct 2020 10:53:22 +0000 (11:53 +0100)

committer Alekos Filini <alekos.filini@gmail.com>

Thu, 29 Oct 2020 10:53:22 +0000 (11:53 +0100)
author Alekos Filini <alekos.filini@gmail.com>
Thu, 29 Oct 2020 10:53:22 +0000 (11:53 +0100)
committer Alekos Filini <alekos.filini@gmail.com>
Thu, 29 Oct 2020 10:53:22 +0000 (11:53 +0100)
diff --cc src/wallet/coin_selection.rs
Simple merge
diff --cc src/wallet/mod.rs
Simple merge
author	Alekos Filini <alekos.filini@gmail.com>
	Thu, 29 Oct 2020 10:53:22 +0000 (11:53 +0100)
committer	Alekos Filini <alekos.filini@gmail.com>
	Thu, 29 Oct 2020 10:53:22 +0000 (11:53 +0100)
		1	2
src/wallet/coin_selection.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/wallet/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history