Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server into errcode

# Conflicts: # pkg/common/config/config.go # pkg/discoveryregistry/discovery_register.go
3 years ago · c2cfb32c45
parent ab6fa41438
commit c2cfb32c45
1 changed files with 1 additions and 1 deletions
--- a/pkg/proto/proto_dir.cfg
+++ b/pkg/proto/proto_dir.cfg
@ -10,5 +10,5 @@ all_proto=(
            msggateway/msg_gateway.proto
            sdkws/ws.proto
            conversation/conversation.proto
-            file/file.proto
+            third/third.proto
 )