From 18ab9af0e94e6baaaf7e91faa264360eca0c32d9 Mon Sep 17 00:00:00 2001
From: Thomas de Brettes <thomas.de-brettes@etu.ec-lyon.fr>
Date: Wed, 2 Apr 2025 02:12:19 +0200
Subject: [PATCH] timer final

---
 htdocs/page_acceuil2.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/page_acceuil2.html b/htdocs/page_acceuil2.html
index 3abbfe9..98b364c 100644
--- a/htdocs/page_acceuil2.html
+++ b/htdocs/page_acceuil2.html
@@ -97,15 +97,10 @@
         <h2>Joueur 1 : <span id="player1-time">300</span> secondes</h2>
         <h2>Joueur 2 : <span id="player2-time">300</span> secondes</h2>
     </div>
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
+
     <div id="echec-message" class="d-none">Échec !</div>
     <div id="echec-et-mat-message" class="d-none">Échec et mat !</div>
     <canvas id="chessboard" class="board" width="480" height="480"></canvas>
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
     <script src="./jquery/jquery.min.js"></script>
     <script src="./bootstrap/js/bootstrap.min.js"></script>
     <script src="/socket.io/socket.io.js"></script>
-- 
GitLab