]> git.bitcoin.ninja Git - rust-lightning/commit
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)
commitca27a85492785ea6352c58ca2036f93e10175119
tree999775e015611964d63615cc34b20b4182f782a7
parent815d255aa8fc30a5869c74158a13bdd5b60bbb33
parent487d6a09a7e1acb581a2f4e1612281c19bde1d62
Merge pull request #3321 from valentinewallace/2024-09-fix-main

Fix silent rebase conflict that broke tests