Merge pull request #336 from ariard/2019-04-in-flight-txn-tracking-clean

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

Fri, 19 Jul 2019 22:02:25 +0000 (18:02 -0400)

committer GitHub <noreply@github.com>

Fri, 19 Jul 2019 22:02:25 +0000 (18:02 -0400)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 19 Jul 2019 22:02:25 +0000 (18:02 -0400)
committer GitHub <noreply@github.com>
Fri, 19 Jul 2019 22:02:25 +0000 (18:02 -0400)
diff --cc src/ln/channelmanager.rs
Simple merge
diff --cc src/ln/functional_test_utils.rs
Simple merge
diff --cc src/ln/functional_tests.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Fri, 19 Jul 2019 22:02:25 +0000 (18:02 -0400)
committer	GitHub <noreply@github.com>
	Fri, 19 Jul 2019 22:02:25 +0000 (18:02 -0400)
		1	2
src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/functional_test_utils.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/functional_tests.rs	patch \|	diff1 \|	diff2 \|	blob \| history