From 7e219b4c886a4ae0b860ae5f4c5c44d89f97ce74 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:02 +0200
Subject: [PATCH] Update page_acceuil2.html

---
 htdocs/page_acceuil2.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/htdocs/page_acceuil2.html b/htdocs/page_acceuil2.html
index d274cdb..3abbfe9 100644
--- a/htdocs/page_acceuil2.html
+++ b/htdocs/page_acceuil2.html
@@ -97,11 +97,14 @@
         <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>
-- 
GitLab