fix: merge conflicts

4 months ago · b40bc731e6
parent 6750e40022
commit b40bc731e6
1 changed files with 0 additions and 2 deletions
--- a/go.mod
+++ b/go.mod
@ -219,5 +219,3 @@ require (
 	golang.org/x/crypto v0.27.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 //replace github.com/openimsdk/tools => /Users/chao/Desktop/code/tools