Merge pull request #1025 from TheBlueMatt/2021-07-detect-htlcs-on-local-commitment

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

Tue, 10 Aug 2021 15:10:45 +0000 (15:10 +0000)

committer GitHub <noreply@github.com>

Tue, 10 Aug 2021 15:10:45 +0000 (15:10 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 10 Aug 2021 15:10:45 +0000 (15:10 +0000)
committer GitHub <noreply@github.com>
Tue, 10 Aug 2021 15:10:45 +0000 (15:10 +0000)
diff --cc lightning/src/chain/channelmonitor.rs
Simple merge
diff --cc lightning/src/ln/mod.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Tue, 10 Aug 2021 15:10:45 +0000 (15:10 +0000)
committer	GitHub <noreply@github.com>
	Tue, 10 Aug 2021 15:10:45 +0000 (15:10 +0000)
		1	2
lightning/src/chain/channelmonitor.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/mod.rs	patch \|	diff1 \|	diff2 \|	blob \| history