From 755eeef1e124d9556ec8b5bcc325c55863c9e48c Mon Sep 17 00:00:00 2001
From: luhaoling <2198702716@qq.com>
Date: Fri, 1 Dec 2023 11:34:05 +0800
Subject: [PATCH] fix: fix the conflect

---
 go.mod | 4 ----
 go.sum | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/go.mod b/go.mod
index fbedbac4a..d0c3adfa6 100644
--- a/go.mod
+++ b/go.mod
@@ -176,8 +176,4 @@ require (
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
-<<<<<<< HEAD
 replace github.com/OpenIMSDK/protocol v0.0.31 => github.com/luhaoling/protocol v0.0.0-20231201032120-22bebe035ae3
-=======
-replace github.com/OpenIMSDK/protocol v0.0.31 => github.com/luhaoling/protocol v0.0.0-20231130102222-4fd608e76fe6
->>>>>>> c13411da69a6457ba810c071a5d7f462eaa1531e
diff --git a/go.sum b/go.sum
index 8fe062dd9..27304cb72 100644
--- a/go.sum
+++ b/go.sum
@@ -274,13 +274,8 @@ github.com/lestrrat-go/strftime v1.0.6 h1:CFGsDEt1pOpFNU+TJB0nhz9jl+K0hZSLE205Ah
 github.com/lestrrat-go/strftime v1.0.6/go.mod h1:f7jQKgV5nnJpYgdEasS+/y7EsTb8ykN2z68n3TtcTaw=
 github.com/lithammer/shortuuid v3.0.0+incompatible h1:NcD0xWW/MZYXEHa6ITy6kaXN5nwm/V115vj2YXfhS0w=
 github.com/lithammer/shortuuid v3.0.0+incompatible/go.mod h1:FR74pbAuElzOUuenUHTK2Tciko1/vKuIKS9dSkDrA4w=
-<<<<<<< HEAD
 github.com/luhaoling/protocol v0.0.0-20231201032120-22bebe035ae3 h1:tWCCSHzacKfJ1v63rNu65fVLytsFV7rCdI+EjwwZmx8=
 github.com/luhaoling/protocol v0.0.0-20231201032120-22bebe035ae3/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
-=======
-github.com/luhaoling/protocol v0.0.0-20231130102222-4fd608e76fe6 h1:6AUtZlgujfj/7YrIJ7YTR0/F9s9BDDJWDJAaqEtLbII=
-github.com/luhaoling/protocol v0.0.0-20231130102222-4fd608e76fe6/go.mod h1:F25dFrwrIx3lkNoiuf6FkCfxuwf8L4Z8UIsdTHP/r0Y=
->>>>>>> c13411da69a6457ba810c071a5d7f462eaa1531e
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=