diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-02 20:39:44 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-07-02 20:39:44 +0200 |
| commit | 3f16971442f1b52f94759b15998bc82e82a90aea (patch) | |
| tree | a511ffaafd45a87c649dc55fbd7d6710e4b93f3a | |
| parent | d6db1157bcab7ace13f046bdfa107b456c1dfbe3 (diff) | |
tests: fix txn_clone.py
Solve merge conflict of test added in #5881 with #6097.
| -rwxr-xr-x | qa/rpc-tests/txn_clone.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/rpc-tests/txn_clone.py b/qa/rpc-tests/txn_clone.py index 19bc34e3f9..08473e6b59 100755 --- a/qa/rpc-tests/txn_clone.py +++ b/qa/rpc-tests/txn_clone.py @@ -7,8 +7,8 @@ # Test proper accounting with an equivalent malleability clone # -from test_framework import BitcoinTestFramework -from bitcoinrpc.authproxy import AuthServiceProxy, JSONRPCException +from test_framework.test_framework import BitcoinTestFramework +from test_framework.authproxy import AuthServiceProxy, JSONRPCException from decimal import Decimal from util import * import os |