From dbfbc43162f8b346f1b63ba234309a7d66855ac4 Mon Sep 17 00:00:00 2001
From: cp <463911765@qq.com>
Date: Tue, 7 Dec 2021 13:48:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/handle.js | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/js/handle.js b/js/handle.js
index 2c577ee..3e3c0a0 100644
--- a/js/handle.js
+++ b/js/handle.js
@@ -179,14 +179,6 @@ function receiveMessage(event)
         leaderInfo = highList[0]
     }
 	// leaderInfo = '内有猛犬小心'
-<<<<<<< HEAD
-	// leaderInfo = '饺子吃肉肉'
-=======
-<<<<<<< HEAD
-	leaderInfo = '饺子吃肉肉'
-=======
->>>>>>> c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
->>>>>>> 41a44859b9fcbc567c4e2c148584eb120ba9900e
     // uid是否存在 不存在则存入uidObj
     let isNew = 0
 
@@ -348,19 +340,6 @@ function receiveMessage(event)
 			// 	}
 			// }
 		}
-<<<<<<< HEAD
-		// 领舞喊荧光棒事件
-		// if(getLeaderFluoEvent(leader.text)!=''){
-		// 	if(firTimes==0){//防多次说话
-		// 		firTimes++;
-		// 		console.log(getLeaderFluoEvent(leader.text));
-		// 		setTimeout(()=>{
-		// 			firTimes = 0;
-		// 		},5000)
-		// 	}
-		// }
-=======
->>>>>>> c5fcb3d64edf80504ff6eccb40845e6e67a9b71e
     }
     // -------------------- 每条弹幕处理 end -----------------------
 }