Fix overlooked merge conflict.

poanetwork · Jul 26, 2019 · a653b03 · a653b03
1 parent 5355d05
commit a653b03
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ethcore/evm/benches/basic.rs b/ethcore/evm/benches/basic.rs
@@ -69,11 +69,8 @@ criterion_group!(
 	mem_gas_calculation_same_u256,
 	mem_gas_calculation_increasing_usize,
 	mem_gas_calculation_increasing_u256,
-<<<<<<< HEAD
 	blockhash_mulmod_small,
 	blockhash_mulmod_large,
-=======
->>>>>>> e1743aebc... Optimisation of the MULMOD opcode (#127)
 );
 criterion_main!(basic);