projects / rust-lightning / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5ecb85 8a74369)
Merge pull request #2170 from TheBlueMatt/2023-04-silent-merge-conflict
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Fri, 7 Apr 2023 18:27:33 +0000 (18:27 +0000)
committerGitHub <noreply@github.com>
Fri, 7 Apr 2023 18:27:33 +0000 (18:27 +0000)
Fix silent merge conflict between new test and payment refactor


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