From 71567a19bd48c5bd8022aaf1319ca3da2ea7e037 Mon Sep 17 00:00:00 2001
From: duhui <d1769111741@163.com>
Date: Thu, 6 Jan 2022 16:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/MessageTypeProto.proto | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 33e5615..16e07fc 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -1404,7 +1404,6 @@ enum MessageType{
 	ArchitectureUnlockIndication = 3050112;
 	
 
-<<<<<<< HEAD
 	//探索地图
 	ExplorerMapInfoRequest = 3050040;
 	ExplorerMapInfoResponse = 3050041;
@@ -1416,8 +1415,7 @@ enum MessageType{
 	ExplorerMapRewardResponse = 3050047;
 	ExplorerMapIndicationResponse = 3050048;
 	
-=======
->>>>>>> 开发/dev_dh
+
 	//森罗幻境自动挂机奖励展示
     TowerGetRewardInfoShowRequest = 3050050;
 	TowerGetRewardInfoShowResponse = 3050051;