Fix silent merge conflict between new test and payment refactor 2023-04-silent-merge-conflict
authorMatt Corallo <git@bluematt.me>
Fri, 7 Apr 2023 16:29:19 +0000 (16:29 +0000)
committerMatt Corallo <git@bluematt.me>
Fri, 7 Apr 2023 16:30:25 +0000 (16:30 +0000)
commit8a743693bab905246ba7f74709378ccddf17c5ac
treeb2c0abf9e5244e01e32e3308f0212c5f9edd728e
parent568a20b8324f42b4f7a4cb9d7bb4adff778bf2d6
Fix silent merge conflict between new test and payment refactor
lightning/src/ln/payment_tests.rs