From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 30 Apr 2021 19:00:35 +0000 (+0000)
Subject: Merge pull request #907 from TheBlueMatt/2021-04-merge-conflicts
X-Git-Tag: v0.0.14~4
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=e26c3df71a4fa8fd6220cd10d068525ebff63783;p=rust-lightning

Merge pull request #907 from TheBlueMatt/2021-04-merge-conflicts

Fix merge conflicts between #898 and #895.
---

e26c3df71a4fa8fd6220cd10d068525ebff63783