fix: resolved merge

This commit is contained in:
diminator 2016-03-21 09:55:37 +01:00
parent 2cc5c41c86
commit 892ab74acc

View File

@ -2,7 +2,7 @@ from abc import ABCMeta, abstractmethod
import bigchaindb.exceptions as exceptions
from bigchaindb import util
from bigchaindb.crypto import hash_data, PublicKey
from bigchaindb.crypto.asymmetric import hash_data
class AbstractConsensusRules(metaclass=ABCMeta):