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

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