cleanup diff

taikoxyz · Jun 25, 2024 · 787302e · 787302e
1 parent 8dfc65d
commit 787302e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,5 @@
 Because this is workspace with multi libraries, tags will be simplified, and with this document you can match version of project with git tag.
 
-<<<<<<< HEAD
-=======
 # v36 tag
 date: 12.05.2024
 
@@ -19,7 +17,6 @@ revm-primitives: 3.1.1 -> 4.0.0 (⚠️ API breaking changes)
 revm-precompile: 6.0.0 -> 7.0.0 (⚠️ API breaking changes)
 revm-test: 0.1.0
 
->>>>>>> v36
 # v35 tag
 date: 02.04.2024
 
@@ -262,7 +259,7 @@ date: 20.1.2022
 
 # v3 tag
 
-* revm: v1.0.0 
+* revm: v1.0.0
 * revme: v0.1.0
 
 # v2 tag

diff --git a/crates/interpreter/src/instructions/i256.rs b/crates/interpreter/src/instructions/i256.rs
@@ -134,14 +134,6 @@ mod tests {
     use super::*;
     use crate::primitives::uint;
     use core::num::Wrapping;
-    use revm_primitives::uint;
-
-    const MAX_POSITIVE_VALUE: U256 = U256::from_limbs([
-        0xffffffffffffffff,
-        0xffffffffffffffff,
-        0xffffffffffffffff,
-        0x7fffffffffffffff,
-    ]);
 
     #[test]
     fn div_i256() {