From 637f6e1b20ed3bd94cb1ee7b095c0759fa46f056 Mon Sep 17 00:00:00 2001
From: Ashwin Sekar <ashwin@solana.com>
Date: Thu, 22 Aug 2024 17:42:13 +0000
Subject: [PATCH] fix conflicts

---
 ledger/src/shred.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ledger/src/shred.rs b/ledger/src/shred.rs
index 19b262382e2472..0f2c90140a3148 100644
--- a/ledger/src/shred.rs
+++ b/ledger/src/shred.rs
@@ -817,9 +817,6 @@ pub mod layout {
             .ok_or(Error::InvalidPayloadSize(shred.len()))
     }
 
-<<<<<<< HEAD
-    pub(crate) fn set_retransmitter_signature(
-=======
     pub fn is_retransmitter_signed_variant(shred: &[u8]) -> Result<bool, Error> {
         match get_shred_variant(shred)? {
             ShredVariant::LegacyCode | ShredVariant::LegacyData => Ok(false),
@@ -837,7 +834,6 @@ pub mod layout {
     }
 
     pub fn set_retransmitter_signature(
->>>>>>> ff87ed9187 (gossip: ignore retransmitter signatures when comparing duplicate shreds (#2673))
         shred: &mut [u8],
         signature: &Signature,
     ) -> Result<(), Error> {