mirror of
https://github.com/bigchaindb/bigchaindb.git
synced 2024-10-13 13:34:05 +00:00
fix: resolved merge
This commit is contained in:
parent
2cc5c41c86
commit
892ab74acc
@ -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):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user