Merge pull request #2415 from wpaulino/update-fee-anchors

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

Mon, 17 Jul 2023 19:45:51 +0000 (19:45 +0000)

committer GitHub <noreply@github.com>

Mon, 17 Jul 2023 19:45:51 +0000 (19:45 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Mon, 17 Jul 2023 19:45:51 +0000 (19:45 +0000)
committer GitHub <noreply@github.com>
Mon, 17 Jul 2023 19:45:51 +0000 (19:45 +0000)
diff --cc lightning/src/chain/chaininterface.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Mon, 17 Jul 2023 19:45:51 +0000 (19:45 +0000)
committer	GitHub <noreply@github.com>
	Mon, 17 Jul 2023 19:45:51 +0000 (19:45 +0000)
		1	2
lightning/src/chain/chaininterface.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history