Merge pull request #2725 from shaavan/issue2096

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

Mon, 5 Feb 2024 23:44:36 +0000 (23:44 +0000)

committer GitHub <noreply@github.com>

Mon, 5 Feb 2024 23:44:36 +0000 (23:44 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 5 Feb 2024 23:44:36 +0000 (23:44 +0000)
committer GitHub <noreply@github.com>
Mon, 5 Feb 2024 23:44:36 +0000 (23:44 +0000)
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/functional_tests.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 5 Feb 2024 23:44:36 +0000 (23:44 +0000)
committer	GitHub <noreply@github.com>
	Mon, 5 Feb 2024 23:44:36 +0000 (23:44 +0000)
		1	2
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history