Merge pull request #2507 from TheBlueMatt/2023-08-lnd-6039

author Elias Rohrer <dev@tnull.de>

Tue, 22 Aug 2023 08:20:02 +0000 (10:20 +0200)

committer GitHub <noreply@github.com>

Tue, 22 Aug 2023 08:20:02 +0000 (10:20 +0200)
author Elias Rohrer <dev@tnull.de>
Tue, 22 Aug 2023 08:20:02 +0000 (10:20 +0200)
committer GitHub <noreply@github.com>
Tue, 22 Aug 2023 08:20:02 +0000 (10:20 +0200)
diff --cc lightning/src/events/mod.rs
Simple merge
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/shutdown_tests.rs
Simple merge
author	Elias Rohrer <dev@tnull.de>
	Tue, 22 Aug 2023 08:20:02 +0000 (10:20 +0200)
committer	GitHub <noreply@github.com>
	Tue, 22 Aug 2023 08:20:02 +0000 (10:20 +0200)
		1	2
lightning/src/events/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/shutdown_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history