From 267d944945daf227421964360c63d9f67c6330f0 Mon Sep 17 00:00:00 2001 From: mand1nga Date: Fri, 8 Apr 2011 19:03:37 -0300 Subject: [PATCH] Fixed conflicting cdtracks --- maps/afterslime.mapinfo | 4 ---- 1 file changed, 4 deletions(-) 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 -- 2.39.2