Merge pull request #2991 from optout21/txsigs-splicing

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

Tue, 16 Apr 2024 20:27:54 +0000 (13:27 -0700)

committer GitHub <noreply@github.com>

Tue, 16 Apr 2024 20:27:54 +0000 (13:27 -0700)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 16 Apr 2024 20:27:54 +0000 (13:27 -0700)
committer GitHub <noreply@github.com>
Tue, 16 Apr 2024 20:27:54 +0000 (13:27 -0700)
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/peer_handler.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Tue, 16 Apr 2024 20:27:54 +0000 (13:27 -0700)
committer	GitHub <noreply@github.com>
	Tue, 16 Apr 2024 20:27:54 +0000 (13:27 -0700)
		1	2
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/peer_handler.rs	patch \|	diff1 \|	diff2 \|	blob \| history