From 9c9ec5f99c61ab18c0c5f14bf6061730a4eb0c11 Mon Sep 17 00:00:00 2001
From: amine-aitmokhtar <aitmokhtaramine1@gmail.com>
Date: Wed, 3 Dec 2025 12:16:37 +0100
Subject: [PATCH] fix remaining merge conflicts

---
 game/client/src/Game.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/game/client/src/Game.tsx b/game/client/src/Game.tsx
index 7e3476d..56f420d 100644
--- a/game/client/src/Game.tsx
+++ b/game/client/src/Game.tsx
@@ -253,12 +253,12 @@ export default function Game() {
       />
 
 
-      <div id="score" style={{ position: "absolute", top: "10px", right: "20px", fontSize: "24px", color: "white", textAlign: "right" }}
+      <div id="score" style={{ position: "absolute", top: "10px", right: "20px", fontSize: "24px", color: "white", textAlign: "right" }}>
         <div>Score: {score}</div>
         <br/>
         <div>Deaths: {deathCount}</div>
-        {/* AJOUT: Affichage de la vitesse */}
-        <div style={{ fontSize: "16px", color: "#ddd" }}>Speed: {displaySpeed}</div>
+        
+        <div style={{ fontSize: "16px", color: "#ddd" }}> Speed: {displaySpeed}</div>
 
       </div>
 
-- 
GitLab