]> git.bitcoin.ninja Git - rust-lightning/commitdiff
projects / rust-lightning / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0133739 4ed148a)
Merge pull request #650 from TheBlueMatt/2020-06-fix-build
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Sun, 28 Jun 2020 18:01:43 +0000 (18:01 +0000)
committerGitHub <noreply@github.com>
Sun, 28 Jun 2020 18:01:43 +0000 (18:01 +0000)
Fix silent merge conflict between bcd65be and 940d7ac


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