From: mand1nga <mand1nga@xonotic.org>
Date: Fri, 8 Apr 2011 22:03:37 +0000 (-0300)
Subject: Fixed conflicting cdtracks
X-Git-Tag: xonotic-v0.5.0~98^2~18^2^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=267d944945daf227421964360c63d9f67c6330f0;p=xonotic%2Fxonotic-maps.pk3dir.git

Fixed conflicting cdtracks
---

diff --git a/maps/afterslime.mapinfo b/maps/afterslime.mapinfo
index 2905d8ea..42739915 100644
--- 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
 has weapons
 gametype dm
 gametype tdm