fix errant conflict markers

penumbra-zone · Dec 12, 2024 · 9da6487 · 9da6487
1 parent 8b1bcd8
commit 9da6487
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/crates/core/component/shielded-pool/src/ics20_withdrawal.rs b/crates/core/component/shielded-pool/src/ics20_withdrawal.rs
@@ -126,11 +126,8 @@ impl From<Ics20Withdrawal> for pb::Ics20Withdrawal {
             timeout_time: w.timeout_time,
             source_channel: w.source_channel.to_string(),
             use_compat_address: w.use_compat_address,
-<<<<<<< HEAD
             use_transparent_address: w.use_transparent_address,
-=======
             ics20_memo: w.ics20_memo.to_string(),
->>>>>>> release/v0.81.x
         }
     }
 }
@@ -162,11 +159,8 @@ impl TryFrom<pb::Ics20Withdrawal> for Ics20Withdrawal {
             timeout_time: s.timeout_time,
             source_channel: ChannelId::from_str(&s.source_channel)?,
             use_compat_address: s.use_compat_address,
-<<<<<<< HEAD
             use_transparent_address: s.use_transparent_address,
-=======
             ics20_memo: s.ics20_memo,
->>>>>>> release/v0.81.x
         })
     }
 }