fix conflict...

solana-labs · Oct 7, 2023 · e8c098d · e8c098d
1 parent 1bb283a
commit e8c098d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/core/src/banking_trace.rs b/core/src/banking_trace.rs
@@ -66,7 +66,6 @@ pub struct BankingTracer {
     active_tracer: Option<ActiveTracer>,
 }
 
-<<<<<<< HEAD
 #[frozen_abi(digest = "Eq6YrAFtTbtPrCEvh6Et1mZZDCARUg1gcK2qiZdqyjUz")]
 #[derive(Serialize, Deserialize, Debug, AbiExample)]
 pub struct TimedTracedEvent(std::time::SystemTime, TracedEvent);