From 28f6a12fbc808cbcc70538b35ef9e309914c3f12 Mon Sep 17 00:00:00 2001
From: Thomas de Brettes <thomas.de-brettes@etu.ec-lyon.fr>
Date: Wed, 2 Apr 2025 02:07:55 +0200
Subject: [PATCH] Update index.js
---
htdocs/index.js | 3 ---
1 file changed, 3 deletions(-)
diff --git a/htdocs/index.js b/htdocs/index.js
index 7538cd3..91667c3 100644
--- a/htdocs/index.js
+++ b/htdocs/index.js
@@ -791,7 +791,6 @@ function estEchecEtMat(pieceAttack , rowPiece, colPiece) {
if (player.isBlackPlayer===true){
[kingRow, kingCol] = find_pieces("K", board);
}
-<<<<<<< Updated upstream
else{
[kingRow, kingCol] = find_pieces("k", board);
}
@@ -902,7 +901,6 @@ function peutIntercepter(kingRow, kingCol, board, attaquant, movesAttaquant) {
}
return false;
}
-=======
socket.on('update-timer', (gameState) => {
@@ -910,4 +908,3 @@ socket.on('update-timer', (gameState) => {
document.getElementById('player2-time').textContent = gameState.player2.time;
});
->>>>>>> Stashed changes
--
GitLab