From 3f16971442f1b52f94759b15998bc82e82a90aea Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Thu, 2 Jul 2015 20:39:44 +0200 Subject: [PATCH] tests: fix txn_clone.py Solve merge conflict of test added in #5881 with #6097. --- qa/rpc-tests/txn_clone.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/rpc-tests/txn_clone.py b/qa/rpc-tests/txn_clone.py index 19bc34e3f..08473e6b5 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