Fix merge conflicts between #898 and #895.
authorMatt Corallo <git@bluematt.me>
Fri, 30 Apr 2021 17:32:36 +0000 (17:32 +0000)
committerMatt Corallo <git@bluematt.me>
Fri, 30 Apr 2021 17:32:36 +0000 (17:32 +0000)
commit8cde7e8db9b7a4084bd47d506d039b7decdd8c41
treec810215b6d8fff0351fd249a4030266481c899a8
parent47cb2939c8d618bfced370e5c9103eac4ee6ce9e
Fix merge conflicts between #898 and #895.
lightning-invoice/src/utils.rs