fix

ProvableHQ · Apr 9, 2024 · 35e4c66 · 35e4c66
1 parent 56f5db7
commit 35e4c66
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/ledger/src/tests.rs b/ledger/src/tests.rs
@@ -30,10 +30,6 @@ use ledger_committee::{Committee, MIN_VALIDATOR_STAKE};
 use ledger_store::{helpers::memory::ConsensusMemory, ConsensusStore};
 use synthesizer::{program::Program, vm::VM, Stack};
 
-<<<<<<< HEAD
-=======
-use console::types::U16;
->>>>>>> 69b5b17a9 (clippy)
 use indexmap::IndexMap;
 
 #[test]