niklas/silent-fh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove merge conflict marker in settings.py

Browse Source 
- remove stray `=======` marker
- clean up excess blank lines
This commit is contained in:
Berger Lena
2026-05-08 19:12:25 +02:00
parent 689d156756
commit 8d8a2b10aa
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/settings.py
+2 -3
View File
@@ -81,8 +81,6 @@ fire_interval = 1000 # ms
respawn_delay = 10000 # ms respawn_delay = 10000 # ms
# --- ITEM SPAWN TIMER --- # --- ITEM SPAWN TIMER ---
ITEM_SPAWN_INTERVAL = 5000 # ms until a new item spawns 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 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_text = (220, 180, 210) # rose
color_border = (55, 35, 70) color_border = (55, 35, 70)
color_start = (255, 0, 0)# dark violet color_start = (255, 0, 0)# dark violet
=======
# --- HIGHSCORE --- # --- HIGHSCORE ---
HIGHSCORE_COLOR_FONT = (0, 0, 0) HIGHSCORE_COLOR_FONT = (0, 0, 0)
HIGHSCORE_COLOR_TABLE = (150, 255, 0) HIGHSCORE_COLOR_TABLE = (150, 255, 0)