removes mergify merge conflicts

solana-labs · Feb 4, 2022 · 20a0265 · 20a0265
1 parent c496771
commit 20a0265
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 797 deletions.
diff --git a/core/src/repair_generic_traversal.rs b/core/src/repair_generic_traversal.rs
diff --git a/ledger-tool/src/main.rs b/ledger-tool/src/main.rs
@@ -186,11 +186,7 @@ fn output_slot(
                 println!(" Slot Meta {:?}", meta);
             } else {
                 println!(
-<<<<<<< HEAD
-                    " num_shreds: {} parent_slot: {} num_entries: {}",
-=======
-                    " num_shreds: {}, parent_slot: {:?}, num_entries: {}, is_full: {}",
->>>>>>> 8d980f07b (uses Option<Slot> for SlotMeta.parent_slot (#21808))
+                    " num_shreds: {} parent_slot: {:?} num_entries: {}",
                     num_shreds,
                     meta.parent_slot,
                     entries.len()