From e39ac0cd6183239560ee80668394bbd770d9333a Mon Sep 17 00:00:00 2001 From: lvxinran Date: Mon, 29 Mar 2021 14:29:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=B2=E7=AA=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ljsd/jieling/logic/family/GuildChallengeLogic.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java index 75a761900..261948a69 100644 --- a/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java +++ b/serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildChallengeLogic.java @@ -342,11 +342,7 @@ public class GuildChallengeLogic { otherIndication.setIsRefresh(1);//需要前端刷新次数 } if(isession!=null){ -<<<<<<< HEAD LOGGER.info("向{}发送indication",sendUid); -======= -// LOGGER.info("向{}发送indication",sendUid); ->>>>>>> master_online_gn MessageUtil.sendIndicationMessage(isession,1,MessageTypeProto.MessageType.GUILD_CHALLENGE_INDICATION_VALUE,otherIndication.build(),true); } }