Merge branch 'master' into develop

This commit is contained in:
Ethan Buchman
2018-06-21 12:57:09 -07:00
7 changed files with 76 additions and 25 deletions
+1 -2
View File
@@ -2,6 +2,5 @@ package types
// UNSTABLE
var (
PeerStateKey = "ConsensusReactor.peerState"
PeerMempoolChKey = "MempoolReactor.peerMempoolCh"
PeerStateKey = "ConsensusReactor.peerState"
)