step transition messaging

2016-11-16 12:43:21 +00:00
parent 8ac989cbeb
commit 2fa34fd6a8
3 changed files with 39 additions and 27 deletions
--- a/json/src/spec/mod.rs
+++ b/json/src/spec/mod.rs
@@ -39,8 +39,5 @@ pub use self::engine::Engine;
 pub use self::state::State;
 pub use self::ethash::{Ethash, EthashParams};
 pub use self::basic_authority::{BasicAuthority, BasicAuthorityParams};
-<<<<<<< HEAD
-pub use self::tendermint::{Tendermint, TendermintParams};
-=======
 pub use self::authority_round::{AuthorityRound, AuthorityRoundParams};
->>>>>>> parity/master
+pub use self::tendermint::{Tendermint, TendermintParams};