Merge pull request #310 from ariard/2019-02-clarify-send-htlc-policy

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

Fri, 2 Aug 2019 19:30:41 +0000 (19:30 +0000)

committer GitHub <noreply@github.com>

Fri, 2 Aug 2019 19:30:41 +0000 (19:30 +0000)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 2 Aug 2019 19:30:41 +0000 (19:30 +0000)
committer GitHub <noreply@github.com>
Fri, 2 Aug 2019 19:30:41 +0000 (19:30 +0000)
diff --cc src/ln/channel.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, 2 Aug 2019 19:30:41 +0000 (19:30 +0000)
committer	GitHub <noreply@github.com>
	Fri, 2 Aug 2019 19:30:41 +0000 (19:30 +0000)
		1	2
src/ln/channel.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