X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=maps%2Fafterslime.mapinfo;h=42739915ceb56cc19100c314d65de4ecc08939d3;hb=267d944945daf227421964360c63d9f67c6330f0;hp=2905d8ea07b5c60d259fc0dbc90ccc90b221d051;hpb=0f16b651dffdcac5aa71450c77a2791ae160be04;p=xonotic%2Fxonotic-maps.pk3dir.git

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