Merge pull request #2395 from wpaulino/phantom-deduped-forward-event

author Elias Rohrer <dev@tnull.de>

Tue, 11 Jul 2023 07:31:37 +0000 (09:31 +0200)

committer GitHub <noreply@github.com>

Tue, 11 Jul 2023 07:31:37 +0000 (09:31 +0200)
author Elias Rohrer <dev@tnull.de>
Tue, 11 Jul 2023 07:31:37 +0000 (09:31 +0200)
committer GitHub <noreply@github.com>
Tue, 11 Jul 2023 07:31:37 +0000 (09:31 +0200)
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge
author	Elias Rohrer <dev@tnull.de>
	Tue, 11 Jul 2023 07:31:37 +0000 (09:31 +0200)
committer	GitHub <noreply@github.com>
	Tue, 11 Jul 2023 07:31:37 +0000 (09:31 +0200)
		1	2
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/functional_test_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history