Fix conflict in config (#5194)

Fluffy-Frontier · Nov 24, 2024 · 87b5f25 · 87b5f25
1 parent 4200e32
commit 87b5f25
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/config/maps.txt b/config/maps.txt
@@ -84,7 +84,6 @@ map serenitystation
 	votable
 endmap
 
-<<<<<<< HEAD
 ##FF MAPS##
 map kilostation2
 	maxplayers 50
@@ -93,8 +92,5 @@ endmap
 
 map nssjourney
 	maxplayers 100
-=======
-map snowglobe
->>>>>>> 8b771c19a8d (Snowglobe Station - A new icemoon station for nova! (#3207))
 	votable
 endmap