diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2021-10-19 10:26:38 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2021-10-19 10:26:41 +0200 |
| commit | 077e98c6c20609bff7ecf1c7c9cdb3f4b31bc139 (patch) | |
| tree | 0c5f9b79136f509ba6c55dfc8e5bc7b856193ee5 /src | |
| parent | 4b24f6bbb51a40e77fcc7f1010eb14187567bc9a (diff) | |
| parent | ffdd94d753ccb8de86eacfb50ffe733c43c1c7c1 (diff) | |
| download | bitcoin-077e98c6c20609bff7ecf1c7c9cdb3f4b31bc139.tar.xz | |
Merge bitcoin/bitcoin#23303: test: Fix wallet_multisig_descriptor_psbt.py
ffdd94d753ccb8de86eacfb50ffe733c43c1c7c1 test: Fix wallet_multisig_descriptor_psbt.py (Hennadii Stepanov)
Pull request description:
The `wallet_multisig_descriptor_psbt.py`, which was introduced in the recent bitcoin/bitcoin#22067, has a merge conflict with the previously merged bitcoin/bitcoin#23207.
Fixed in this PR.
ACKs for top commit:
mjdietzx:
Tested ACK ffdd94d
S3RK:
ACK ffdd94d
Tree-SHA512: e8871aeebbe119e22347de19f62b4524e191885d66f94af802a33793dfa413790901fd54aeea1ab3d1b1487cb457e8a58b0aef19d0dc78b12a583646ba4af67e
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions