Fix build broken by silent merge conflicts
authorMatt Corallo <git@bluematt.me>
Fri, 15 Nov 2019 22:19:26 +0000 (17:19 -0500)
committerMatt Corallo <git@bluematt.me>
Fri, 15 Nov 2019 22:20:03 +0000 (17:20 -0500)
commit2118feb090c279be7a1eac4f7104dd619a6f379e
tree270d9ca49dcddd9ab6c6337964ed8181eec7227c
parent148c79719e9177709c7b546d2636e3fa28046fc9
Fix build broken by silent merge conflicts
src/ln/channelmanager.rs