Rebase

ralexstokes · Apr 29, 2024 · a4b1d73 · a4b1d73
1 parent 0148383
commit a4b1d73
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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;