Trident: Extend a clip that was too short + fix a tiny z-fight

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

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