From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Tue, 17 Sep 2024 21:45:30 +0000 (+0000)
Subject: Merge pull request #3321 from valentinewallace/2024-09-fix-main
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=ca27a85492785ea6352c58ca2036f93e10175119;p=rust-lightning

Merge pull request #3321 from valentinewallace/2024-09-fix-main

Fix silent rebase conflict that broke tests
---

ca27a85492785ea6352c58ca2036f93e10175119