From dbcd388dee1983c52234977d9efcbb7672c05d2b Mon Sep 17 00:00:00 2001
From: liyuhua <15626451870@163.com>
Date: Tue, 12 Sep 2023 18:15:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E5=85=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YuMi/Modules/YMMine/View/XPMineViewController.m | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/YuMi/Modules/YMMine/View/XPMineViewController.m b/YuMi/Modules/YMMine/View/XPMineViewController.m
index 55b2ea1c..d6462f53 100644
--- a/YuMi/Modules/YMMine/View/XPMineViewController.m
+++ b/YuMi/Modules/YMMine/View/XPMineViewController.m
@@ -642,7 +642,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
 - (void)onGetClanDetailInfofailWithGroup:(dispatch_group_t)group{
 	dispatch_group_leave(group);
 }
-<<<<<<< HEAD
+
 ///匹配游戏房成功
 - (void)quickMatchLittleGameRoomSuccess:(HomeLittleGameRoomModel *)roomInfo mgId:(NSString *)mgId {
     if (roomInfo.isPick && roomInfo.uid.length > 0) {
@@ -692,8 +692,7 @@ UIKIT_EXTERN NSString *kRequestRicket;
 - (void)quickMatchLittleGameRoomFail:(NSString *)mgId {
     [XPRoomViewController openRoom:[NSString stringWithFormat:@"%ld", self.userInfo.uid] mgId:mgId viewController:self];
 }
-=======
->>>>>>> 90b22d5 (代充优化)
+
 
 #pragma mark - XPMineHeadItemTableViewCellDelegate
 - (void)xPMineHeadItemTableViewCell:(XPMineHeadItemTableViewCell *)cell didSelectItem:(XPMineFuntionItemModel *)item {