Skip to content

Commit

Permalink
tests: fix txn_clone.py
Browse files Browse the repository at this point in the history
Solve merge conflict of test added in #5881 with #6097.
  • Loading branch information
laanwj committed Jul 2, 2015
1 parent d6db115 commit 3f16971
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions qa/rpc-tests/txn_clone.py
Expand Up @@ -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
Expand Down

0 comments on commit 3f16971

Please sign in to comment.