Resolves a merge conflict that was accidentally committed in BIP 370. Also fixes a typo.
370: Fix merge conflict and typo #1363
pull achow101 wants to merge 1 commits into bitcoin:master from achow101:370-git-conflict changing 1 files +1 −9-
achow101 commented at 5:05 PM on September 1, 2022: member
-
370: Fix merge conflict and typo e6c08f3fac
-
katesalazar commented at 4:25 PM on September 3, 2022: contributor
ACK e6c08f3fac1cb7c2ce67797ff8f671bef9d4097d
- luke-jr merged this on Sep 29, 2022
- luke-jr closed this on Sep 29, 2022
Contributors