From 8d8a2b10aa7702238bad7f44bbe0282cfd2316dd Mon Sep 17 00:00:00 2001
From: Berger Lena <lena.berger@edu.fh-joanneum.at>
Date: Fri, 8 May 2026 19:12:25 +0200
Subject: [PATCH] fix: remove merge conflict marker in settings.py

- remove stray `=======` marker
- clean up excess blank lines
---
 src/settings.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/settings.py b/src/settings.py
index 62b3e56..2c3cac2 100644
--- a/src/settings.py
+++ b/src/settings.py
@@ -81,8 +81,6 @@ fire_interval = 1000 # ms
 respawn_delay = 10000 # ms
 
 
-
-
 # --- ITEM SPAWN TIMER ---
 ITEM_SPAWN_INTERVAL = 5000      # ms until a new item spawns
 ITEM_SHOPPING_TIMER = 10000     # how long you have time to buy items before they despawn
@@ -142,7 +140,8 @@ color_void = (10, 10, 15)       # a little more black
 color_text = (220, 180, 210)    # rose
 color_border = (55, 35, 70)
 color_start = (255, 0, 0)# dark violet
-=======
+
+
 # --- HIGHSCORE ---
 HIGHSCORE_COLOR_FONT = (0, 0, 0)
 HIGHSCORE_COLOR_TABLE = (150, 255, 0)