fix conflicts

anza-xyz · Aug 22, 2024 · 637f6e1 · 637f6e1
1 parent d64bf75
commit 637f6e1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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> {