From 1d695352577c2d1f91e54fdd038c281e061d01a7 Mon Sep 17 00:00:00 2001
From: Ashwin Sekar <ashwin@solana.com>
Date: Mon, 22 Apr 2024 23:26:11 +0000
Subject: [PATCH] fix blockstore_meta conflict

---
 ledger/src/blockstore_meta.rs | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/ledger/src/blockstore_meta.rs b/ledger/src/blockstore_meta.rs
index 6841caa860c072..72dc25e624b999 100644
--- a/ledger/src/blockstore_meta.rs
+++ b/ledger/src/blockstore_meta.rs
@@ -392,22 +392,11 @@ impl ErasureMeta {
         self.first_coding_index..self.first_coding_index + num_coding
     }
 
-<<<<<<< HEAD
-=======
     #[allow(dead_code)]
     pub(crate) fn first_received_coding_shred_index(&self) -> Option<u32> {
         u32::try_from(self.first_received_coding_index).ok()
     }
 
-    pub(crate) fn next_fec_set_index(&self) -> Option<u32> {
-        let num_data = u64::try_from(self.config.num_data).ok()?;
-        self.set_index
-            .checked_add(num_data)
-            .map(u32::try_from)?
-            .ok()
-    }
-
->>>>>>> f1336970d0 (blockstore: store first received coding shred index in ErasureMeta (#961))
     pub(crate) fn status(&self, index: &Index) -> ErasureMetaStatus {
         use ErasureMetaStatus::*;