]> git.bitcoin.ninja Git - rust-lightning/commitdiff
projects / rust-lightning / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aaacaf4 ee34bcf)
Merge pull request #2886 from TheBlueMatt/2024-02-actually-fix-build
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 9 Feb 2024 00:08:28 +0000 (00:08 +0000)
committerGitHub <noreply@github.com>
Fri, 9 Feb 2024 00:08:28 +0000 (00:08 +0000)
 Fix silent merge conflict introduced in d3ddf15 @TheBlueMatt


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