chore: update go.mod

taikoxyz · Feb 4, 2025 · af55fc1 · af55fc1
1 parent 820ee14
commit af55fc1
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/go.mod b/go.mod
@@ -318,11 +318,7 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )
 
-<<<<<<< HEAD
 replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.12.1-0.20250204084657-54ca2198a63b
-=======
-replace github.com/ethereum/go-ethereum v1.14.11 => github.com/taikoxyz/taiko-geth v1.12.1-0.20250204084028-d44ab28bb9f7
->>>>>>> e5d23e23a (feat: set l1 origin)
 
 replace github.com/ethereum-optimism/optimism v1.7.4 => github.com/taikoxyz/optimism v0.0.0-20250128202721-1b986d622e1a