Fix silent merge conflict introduced in d3ddf15357589ed10f4c844dc22
authorMatt Corallo <git@bluematt.me>
Thu, 8 Feb 2024 23:04:19 +0000 (23:04 +0000)
committerMatt Corallo <git@bluematt.me>
Thu, 8 Feb 2024 23:05:08 +0000 (23:05 +0000)
commit5faca20934826b05b170ca462f23a319824d8a8b
tree1d2f2858e0e315a12a55b17b20c12ff3e3838d4f
parentaaacaf45e33dcdaa7be788971d3d26f69854d356
Fix silent merge conflict introduced in d3ddf15357589ed10f4c844dc22
lightning/src/ln/functional_tests.rs