fix: merge conflicts

This commit is contained in:
withchao
2025-05-16 14:31:50 +08:00
parent b40bc731e6
commit 8e7457febb
5 changed files with 44 additions and 62 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ require (
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/mitchellh/mapstructure v1.5.0
github.com/openimsdk/protocol v0.0.73-alpha.6
github.com/openimsdk/tools v0.0.50-alpha.81
github.com/openimsdk/tools v0.0.50-alpha.82
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.18.0
github.com/stretchr/testify v1.9.0