From 57e430222f9e2c49f9a26bde4219e363459316fb Mon Sep 17 00:00:00 2001
From: Mysteries <mysteriousragnarok@hotmail.com>
Date: Sun, 10 Feb 2013 23:57:23 -0500
Subject: Revert "Maps"

This reverts commit abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.
---
 conf/maps.conf | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'conf/maps.conf')

diff --git a/conf/maps.conf b/conf/maps.conf
index 01baea7da..7a0169dd2 100644
--- a/conf/maps.conf
+++ b/conf/maps.conf
@@ -1048,11 +1048,7 @@ map: moc_prydn1
 map: moc_prydn2
 
 // ===============================
-<<<<<<< HEAD
 // New Maps added 2013-02-10
-=======
-// New Maps added 2013-02-10 (Thanks Streusel!)
->>>>>>> Maps
 // ===============================
 //map: iz_int
 //map: iz_int01
-- 
cgit v1.2.3-70-g09d2