Merge pull request #1388 from lightning-signer/2022-03-grind

author Arik Sosman <arik-so@users.noreply.github.com>

Fri, 25 Mar 2022 23:35:21 +0000 (16:35 -0700)

committer GitHub <noreply@github.com>

Fri, 25 Mar 2022 23:35:21 +0000 (16:35 -0700)
author Arik Sosman <arik-so@users.noreply.github.com>
Fri, 25 Mar 2022 23:35:21 +0000 (16:35 -0700)
committer GitHub <noreply@github.com>
Fri, 25 Mar 2022 23:35:21 +0000 (16:35 -0700)
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
author	Arik Sosman <arik-so@users.noreply.github.com>
	Fri, 25 Mar 2022 23:35:21 +0000 (16:35 -0700)
committer	GitHub <noreply@github.com>
	Fri, 25 Mar 2022 23:35:21 +0000 (16:35 -0700)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history