Revert "Fix clippy lints on merge-f2f (sigp#2626)"

This reverts commit 076e624.
realbigsean · Sep 27, 2021 · 8e4a2be · 8e4a2be
1 parent 1f86049
commit 8e4a2be
Showing 1 changed file with 0 additions and 10 deletions.
diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs
@@ -359,16 +359,6 @@ pub fn process_execution_payload<T: EthSpec>(
             }
         );
         block_verify!(
-<<<<<<< HEAD
-=======
-            payload.random == *state.get_randao_mix(state.current_epoch())?,
-            BlockProcessingError::ExecutionRandaoMismatch {
-                expected: *state.get_randao_mix(state.current_epoch())?,
-                found: payload.random,
-            }
-        );
-        block_verify!(
->>>>>>> a99e8d7a5 (Fix clippy lints on merge-f2f (#2626))
             is_valid_gas_limit(payload, state.latest_execution_payload_header()?)?,
             BlockProcessingError::ExecutionInvalidGasLimit {
                 used: payload.gas_used,