Merge pull request #163 from ariard/claim_revoked_htlc_tx

author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>

Thu, 13 Sep 2018 17:53:47 +0000 (13:53 -0400)

committer GitHub <noreply@github.com>

Thu, 13 Sep 2018 17:53:47 +0000 (13:53 -0400)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Thu, 13 Sep 2018 17:53:47 +0000 (13:53 -0400)
committer GitHub <noreply@github.com>
Thu, 13 Sep 2018 17:53:47 +0000 (13:53 -0400)
diff --cc src/ln/channel.rs
Simple merge
diff --cc src/ln/channelmanager.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Thu, 13 Sep 2018 17:53:47 +0000 (13:53 -0400)
committer	GitHub <noreply@github.com>
	Thu, 13 Sep 2018 17:53:47 +0000 (13:53 -0400)
		1	2
src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history