timer final

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>