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 42739915ceb56cc19100c314d65de4ecc08939d3..2905d8ea07b5c60d259fc0dbc90ccc90b221d051 100644 (file)
--- a/maps/afterslime.mapinfo
+++ b/maps/afterslime.mapinfo
@@ -1,7 +1,11 @@
 title Afterslime
 description Medium sized indoor deathmatch map
 author kuniu the frogg
+<<<<<<< HEAD
 cdtrack 3
+=======
+cdtrack 8
+>>>>>>> c5a920af43cfefb3bf459078dce4da8285724de0
 has weapons
 gametype dm
 gametype tdm