Merge pull request #3034 from TheBlueMatt/2024-04-2982-123-fix

[0.0.123] Don't attempt to resume channels if we already exchanged funding

diff --cc lightning/src/ln/channel.rs
Simple merge

diff --cc lightning/src/ln/channelmanager.rs
Simple merge