]> git.bitcoin.ninja Git - rust-lightning/commitdiff
projects / rust-lightning / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47cb293 b9a934e)
Merge pull request #907 from TheBlueMatt/2021-04-merge-conflicts
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 30 Apr 2021 19:00:35 +0000 (19:00 +0000)
committerGitHub <noreply@github.com>
Fri, 30 Apr 2021 19:00:35 +0000 (19:00 +0000)
Fix merge conflicts between #898 and #895.


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