Merge branch 'master' into cbrutail/darkzone

[xonotic/xonotic-maps.pk3dir.git] / maps / afterslime.mapinfo

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 2905d8ea07b5c60d259fc0dbc90ccc90b221d051..f0c778881d6ed18f5444c3e90ee47e4a3fe9f7c3 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -1,11 +1,7 @@
 title Afterslime
 description Medium sized indoor deathmatch map
 author kuniu the frogg
-<<<<<<< HEAD
-cdtrack 3
-=======
-cdtrack 8
->>>>>>> c5a920af43cfefb3bf459078dce4da8285724de0
+cdtrack 12
 has weapons
 gametype dm
 gametype tdm
@@ -13,6 +9,7 @@ gametype lms
 gametype ca
 gametype arena
 gametype rune
-gametype freezetag
+gametype ft
+gametype ka
 gametype kh
 gametype dom