From c2cfb32c45cf5e757f00291471b4198644d92d17 Mon Sep 17 00:00:00 2001
From: wangchuxiao <wangchuxiao97@outlook.com>
Date: Tue, 28 Feb 2023 15:48:42 +0800
Subject: [PATCH] Merge branch 'errcode' of github.com:OpenIMSDK/Open-IM-Server
 into errcode

# Conflicts:
#	pkg/common/config/config.go
#	pkg/discoveryregistry/discovery_register.go
---
 pkg/proto/proto_dir.cfg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/proto/proto_dir.cfg b/pkg/proto/proto_dir.cfg
index 2ae80f045..87ea1026e 100644
--- 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
 )