modify go.mod

2 years ago · 39b2c3b795
parent f039d53a7d
commit 39b2c3b795
1 changed files with 1 additions and 10 deletions
--- a/go.mod
+++ b/go.mod
@ -155,13 +155,4 @@ require (
 	go.uber.org/zap v1.24.0 // indirect
 	golang.org/x/crypto v0.14.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-)
-
-<<<<<<<<< Temporary merge branch 1
-replace github.com/OpenIMSDK/protocol v0.0.36 => github.com/AndrewZuo01/protocol v0.0.0-20231220081029-2bda660f0e88
-
-
-
-=========
-replace github.com/OpenIMSDK/protocol v0.0.40 => github.com/luhaoling/protocol v0.0.0-20231227040641-2f934a0d64a3
->>>>>>>>> Temporary merge branch 2
+)