Merge pull request #2591 from TheBlueMatt/2023-09-2562-followups

author Elias Rohrer <dev@tnull.de>

Fri, 29 Sep 2023 17:08:36 +0000 (19:08 +0200)

committer GitHub <noreply@github.com>

Fri, 29 Sep 2023 17:08:36 +0000 (19:08 +0200)
author Elias Rohrer <dev@tnull.de>
Fri, 29 Sep 2023 17:08:36 +0000 (19:08 +0200)
committer GitHub <noreply@github.com>
Fri, 29 Sep 2023 17:08:36 +0000 (19:08 +0200)
diff --cc lightning-persister/src/fs_store.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
author	Elias Rohrer <dev@tnull.de>
	Fri, 29 Sep 2023 17:08:36 +0000 (19:08 +0200)
committer	GitHub <noreply@github.com>
	Fri, 29 Sep 2023 17:08:36 +0000 (19:08 +0200)
		1	2
lightning-persister/src/fs_store.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history