代充优化

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 {