Merge pull request #1053 from valentinewallace/2021-08-dedup-payment-sent

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

Fri, 17 Sep 2021 20:59:29 +0000 (20:59 +0000)

committer GitHub <noreply@github.com>

Fri, 17 Sep 2021 20:59:29 +0000 (20:59 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 17 Sep 2021 20:59:29 +0000 (20:59 +0000)
committer GitHub <noreply@github.com>
Fri, 17 Sep 2021 20:59:29 +0000 (20:59 +0000)
diff --cc lightning/src/ln/channel.rs
Simple merge
diff --cc lightning/src/ln/channelmanager.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Fri, 17 Sep 2021 20:59:29 +0000 (20:59 +0000)
committer	GitHub <noreply@github.com>
	Fri, 17 Sep 2021 20:59:29 +0000 (20:59 +0000)
		1	2
lightning/src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
lightning/src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history