Merge pull request #53 from savil/rename-error-msg-to-action

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

Fri, 20 Jul 2018 03:30:28 +0000 (23:30 -0400)

committer GitHub <noreply@github.com>

Fri, 20 Jul 2018 03:30:28 +0000 (23:30 -0400)
author Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 20 Jul 2018 03:30:28 +0000 (23:30 -0400)
committer GitHub <noreply@github.com>
Fri, 20 Jul 2018 03:30:28 +0000 (23:30 -0400)
diff --cc src/ln/channel.rs
Simple merge
diff --cc src/ln/channelmanager.rs
Simple merge
author	Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
	Fri, 20 Jul 2018 03:30:28 +0000 (23:30 -0400)
committer	GitHub <noreply@github.com>
	Fri, 20 Jul 2018 03:30:28 +0000 (23:30 -0400)
		1	2
src/ln/channel.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/ln/channelmanager.rs	patch \|	diff1 \|	diff2 \|	blob \| history