From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Sun, 28 Jun 2020 18:01:43 +0000 (+0000)
Subject: Merge pull request #650 from TheBlueMatt/2020-06-fix-build
X-Git-Tag: v0.0.12~52
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=cd13364d442faa1bb4edc433112e4000cbaf0d94;p=rust-lightning

Merge pull request #650 from TheBlueMatt/2020-06-fix-build

Fix silent merge conflict between bcd65be and 940d7ac
---

cd13364d442faa1bb4edc433112e4000cbaf0d94