From 8ef16ba85fbb40c03928fb1203291d8b0619878e Mon Sep 17 00:00:00 2001
From: Porterlu <1258210724@qq.com>
Date: Sat, 17 Aug 2024 04:19:33 +0800
Subject: [PATCH] fix

---
 rocketemu/spike_rs/src/spike_event.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/rocketemu/spike_rs/src/spike_event.rs b/rocketemu/spike_rs/src/spike_event.rs
index b9cddbf6c0..5d62678223 100644
--- a/rocketemu/spike_rs/src/spike_event.rs
+++ b/rocketemu/spike_rs/src/spike_event.rs
@@ -100,10 +100,6 @@ pub struct SpikeEvent {
 }
 
 impl SpikeEvent {
-<<<<<<< HEAD
-  
-=======
->>>>>>> 9c6d4dfe (get info with pc)
   pub fn new_with_pc(pc: u64, do_log_vrf: bool) -> Self {
     SpikeEvent {
       do_log_vrf,