From 39b2c3b795b1edf749559fd1518d9f28c20137b6 Mon Sep 17 00:00:00 2001
From: AndrewZuo01 <andrew.zuo@wustl.edu>
Date: Fri, 29 Dec 2023 18:34:09 +0800
Subject: [PATCH] modify go.mod

---
 go.mod | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/go.mod b/go.mod
index a5685a088..393e742de 100644
--- 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
+)
\ No newline at end of file