From d39bcaa42c282c7c696cd7164b2c545d7f9c73ee Mon Sep 17 00:00:00 2001
From: Thomas de Brettes <thomas.de-brettes@etu.ec-lyon.fr>
Date: Wed, 2 Apr 2025 02:09:59 +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 1b71f29..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,8 +901,6 @@ function peutIntercepter(kingRow, kingCol, board, attaquant, movesAttaquant) {
     }
     return false;
 }
-=======
->>>>>>> Stashed changes
 
 
 socket.on('update-timer', (gameState) => {
-- 
GitLab