Merge pull request #1201 from jkczyz/2021-12-idempotent-channelmanager

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

Tue, 7 Dec 2021 00:42:02 +0000 (00:42 +0000)

committer GitHub <noreply@github.com>

Tue, 7 Dec 2021 00:42:02 +0000 (00:42 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 7 Dec 2021 00:42:02 +0000 (00:42 +0000)
committer GitHub <noreply@github.com>
Tue, 7 Dec 2021 00:42:02 +0000 (00:42 +0000)
diff --cc lightning/src/ln/functional_test_utils.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Tue, 7 Dec 2021 00:42:02 +0000 (00:42 +0000)
committer	GitHub <noreply@github.com>
	Tue, 7 Dec 2021 00:42:02 +0000 (00:42 +0000)