fix conflict...

solana-labs · Oct 7, 2023 · a8a447e · a8a447e
1 parent 1822022
commit a8a447e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/src/banking_trace.rs b/core/src/banking_trace.rs
@@ -66,20 +66,12 @@ pub struct BankingTracer {
     active_tracer: Option<ActiveTracer>,
 }
 
-<<<<<<< HEAD
-#[derive(Serialize, Deserialize, Debug)]
-pub struct TimedTracedEvent(std::time::SystemTime, TracedEvent);
-
-#[derive(Serialize, Deserialize, Debug)]
-enum TracedEvent {
-=======
 #[frozen_abi(digest = "Eq6YrAFtTbtPrCEvh6Et1mZZDCARUg1gcK2qiZdqyjUz")]
 #[derive(Serialize, Deserialize, Debug, AbiExample)]
-pub struct TimedTracedEvent(pub std::time::SystemTime, pub TracedEvent);
+pub struct TimedTracedEvent(std::time::SystemTime, TracedEvent);
 
 #[derive(Serialize, Deserialize, Debug, AbiExample, AbiEnumVisitor)]
-pub enum TracedEvent {
->>>>>>> 95810d876a (Enable frozen_abi on banking trace file (#33501))
+enum TracedEvent {
     PacketBatch(ChannelLabel, BankingPacketBatch),
     BlockAndBankHash(Slot, Hash, Hash),
 }