From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Fri, 7 Apr 2023 18:27:33 +0000 (+0000)
Subject: Merge pull request #2170 from TheBlueMatt/2023-04-silent-merge-conflict
X-Git-Tag: v0.0.115~30
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=f30dc859e72763618249b1a1686229013178d057;p=rust-lightning

Merge pull request #2170 from TheBlueMatt/2023-04-silent-merge-conflict

Fix silent merge conflict between new test and payment refactor
---

f30dc859e72763618249b1a1686229013178d057