Remove uneeded comments

everx-labs · Mar 31, 2023 · 38ec925 · 38ec925
1 parent ec3ab07
commit 38ec925
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/src/validator/validator_manager.rs b/src/validator/validator_manager.rs
@@ -606,11 +606,7 @@ impl ValidatorManagerImpl {
                 cc_seqno,
                 &self.config
             );
-//=======
-//            if let Some(local_key) = self.find_us(&subset.0) {
-//                let vsubset = ValidatorSet::with_cc_seqno(0, 0, 0, cc_seqno, subset.0)?;
-//>>>>>>> fb7e32d041c8044f742b29a4ebe0043997cebb7d
-
+
             let session_info = SessionInfo::new(ident.clone(), session_id.clone(), vsubset.clone());
             let old_shards: Vec<ShardIdent> = prev_blocks.iter().map(|blk| blk.shard_id.clone()).collect();
             self.session_history.new_session_after(session_info.clone(), old_shards.clone())?;