Merge branch 'diabolik/afterslime' of ssh://git.xonotic.org/xonotic-maps.pk3dir into...

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

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 0783b523bf7d4a82c5995a5f90620db1fe2df6b7..2905d8ea07b5c60d259fc0dbc90ccc90b221d051 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -1,13 +1,18 @@
 title Afterslime
-description Medium sized indoor deathmatch map.
+description Medium sized indoor deathmatch map
 author kuniu the frogg
+<<<<<<< HEAD
+cdtrack 3
+=======
 cdtrack 8
+>>>>>>> c5a920af43cfefb3bf459078dce4da8285724de0
 has weapons
-type dm 30 20
-type tdm 50 20 2
-type lms 9 20
-type ca 200 20
-type arena 10 20
-type rune 200 20
-type freezetag 200 20 2
-type kh 200 20 2
+gametype dm
+gametype tdm
+gametype lms
+gametype ca
+gametype arena
+gametype rune
+gametype freezetag
+gametype kh
+gametype dom