From a4b1d73df85433060ab433450a3f56c3bb46001b Mon Sep 17 00:00:00 2001
From: EchoAlice <echoalice0@gmail.com>
Date: Mon, 29 Apr 2024 14:16:34 -0600
Subject: [PATCH] Rebase

---
 ethereum-consensus/src/electra/mod.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ethereum-consensus/src/electra/mod.rs b/ethereum-consensus/src/electra/mod.rs
index 1d87cb6ac..c533b8113 100644
--- a/ethereum-consensus/src/electra/mod.rs
+++ b/ethereum-consensus/src/electra/mod.rs
@@ -2,11 +2,7 @@ pub mod beacon_block;
 pub mod beacon_state;
 pub mod block_processing;
 pub mod constants;
-<<<<<<< HEAD
-pub mod execution_engine;
-=======
 pub mod epoch_processing;
->>>>>>> 3b086684 (Create `epoch_processing` module and `process_registry_updates()`)
 pub mod execution_payload;
 pub mod fork;
 pub mod genesis;