fix: conflicts

2 years ago · 940a5921c1
parent 45a236ae64
commit 940a5921c1
1 changed files with 0 additions and 5 deletions
--- a/internal/tools/msg.go
+++ b/internal/tools/msg.go
@ -29,11 +29,6 @@ import (
 	"github.com/OpenIMSDK/tools/mw"
 	"github.com/OpenIMSDK/tools/tx"
 	"github.com/OpenIMSDK/tools/utils"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/discovery_register"
 	"github.com/redis/go-redis/v9"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 	"math"
 	"math/rand"
 	"github.com/openimsdk/open-im-server/v3/pkg/common/config"