From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:08:28 +0000 (+0000) Subject: Merge pull request #2886 from TheBlueMatt/2024-02-actually-fix-build X-Git-Tag: v0.0.123-beta~72 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=81cc0d3d6c2e9bf2441f61256c1c00dab089de28;p=rust-lightning Merge pull request #2886 from TheBlueMatt/2024-02-actually-fix-build Fix silent merge conflict introduced in d3ddf15 @TheBlueMatt --- 81cc0d3d6c2e9bf2441f61256c1c00dab089de28