Mirroristas/bigchaindb
2
0
Fork 0
mirror of https://github.com/bigchaindb/bigchaindb.git synced 2024-10-13 13:34:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolved merge

Browse Source
This commit is contained in:
diminator 2016-03-21 09:55:37 +01:00
parent 2cc5c41c86
commit 892ab74acc
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bigchaindb/consensus.py
View File

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