projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0f16b65)
Fixed conflicting cdtracks
authormand1nga <mand1nga@xonotic.org>
Fri, 8 Apr 2011 22:03:37 +0000 (19:03 -0300)
committermand1nga <mand1nga@xonotic.org>
Fri, 8 Apr 2011 22:03:37 +0000 (19:03 -0300)
maps/afterslime.mapinfo patch | blob | history

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 2905d8ea07b5c60d259fc0dbc90ccc90b221d051..42739915ceb56cc19100c314d65de4ecc08939d3 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
 title Afterslime
 description Medium sized indoor deathmatch map
 author kuniu the frogg
-<<<<<<< HEAD
 cdtrack 3
 cdtrack 3
-=======
-cdtrack 8
->>>>>>> c5a920af43cfefb3bf459078dce4da8285724de0
 has weapons
 gametype dm
 gametype tdm
 has weapons
 gametype dm
 gametype tdm