update go.mod

dydxprotocol · Mar 22, 2024 · d0dac4c · d0dac4c
1 parent 14f2a64
commit d0dac4c
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/protocol/go.mod b/protocol/go.mod
@@ -394,14 +394,8 @@ require (
 	gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-<<<<<<< HEAD
-	gotest.tools/v3 v3.5.1 // indirect
-	honnef.co/go/tools v0.4.5 // indirect
-	mvdan.cc/gofumpt v0.5.0 // indirect
-=======
 	honnef.co/go/tools v0.4.6 // indirect
 	mvdan.cc/gofumpt v0.6.0 // indirect
->>>>>>> e545bbfe ([OTE-221] Add query for PendingSendPacket (#1176))
 	mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect
 	mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect
 	mvdan.cc/unparam v0.0.0-20221223090309-7455f1af531d // indirect