Merge pull request #966 from TheBlueMatt/2021-06-workaround-broken-lnd

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

Tue, 29 Jun 2021 16:28:38 +0000 (16:28 +0000)

committer GitHub <noreply@github.com>

Tue, 29 Jun 2021 16:28:38 +0000 (16:28 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 29 Jun 2021 16:28:38 +0000 (16:28 +0000)
committer GitHub <noreply@github.com>
Tue, 29 Jun 2021 16:28:38 +0000 (16:28 +0000)
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Tue, 29 Jun 2021 16:28:38 +0000 (16:28 +0000)
committer	GitHub <noreply@github.com>
	Tue, 29 Jun 2021 16:28:38 +0000 (16:28 +0000)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history