Fix silent merge conflict between bcd65bed7bd9a and 940d7ac8d897589
authorMatt Corallo <git@bluematt.me>
Sun, 28 Jun 2020 17:19:40 +0000 (13:19 -0400)
committerMatt Corallo <git@bluematt.me>
Sun, 28 Jun 2020 17:19:40 +0000 (13:19 -0400)
commit94c37c6c0e6825974120bf694524844f2bc07985
tree799d7bfdf5af279a4054d007ae23761ce55952b1
parent0133739e9e585ebe966ba4a1d41b003f4f4769bf
Fix silent merge conflict between bcd65bed7bd9a and 940d7ac8d897589
lightning/src/ln/functional_tests.rs