]> git.bitcoin.ninja Git - rust-lightning/commitdiff
projects / rust-lightning / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 815d255 487d6a0)
Merge pull request #3321 from valentinewallace/2024-09-fix-main
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 17 Sep 2024 21:45:30 +0000 (21:45 +0000)
committerGitHub <noreply@github.com>
Tue, 17 Sep 2024 21:45:30 +0000 (21:45 +0000)
Fix silent rebase conflict that broke tests


Trivial merge
Personal fork of Rust-Lightning. Upstream is https://github.com/rust-bitcoin/rust-lightning