Merge pull request #1830 from jurvis/jurvis/2022-10-calculate-inflight-with-chanmanager

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

Mon, 21 Nov 2022 19:32:58 +0000 (19:32 +0000)

committer GitHub <noreply@github.com>

Mon, 21 Nov 2022 19:32:58 +0000 (19:32 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 21 Nov 2022 19:32:58 +0000 (19:32 +0000)
committer GitHub <noreply@github.com>
Mon, 21 Nov 2022 19:32:58 +0000 (19:32 +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>
	Mon, 21 Nov 2022 19:32:58 +0000 (19:32 +0000)
committer	GitHub <noreply@github.com>
	Mon, 21 Nov 2022 19:32:58 +0000 (19:32 +0000)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history