From b40bc731e670677fae68f8bc7b8289557c0fb90f Mon Sep 17 00:00:00 2001
From: withchao <993506633@qq.com>
Date: Thu, 15 May 2025 14:26:30 +0800
Subject: [PATCH] fix: merge conflicts

---
 go.mod | 2 --
 1 file changed, 2 deletions(-)

diff --git a/go.mod b/go.mod
index 88289d2a9..218f77a3d 100644
--- 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