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.
---
 db/map_index.txt | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'db/map_index.txt')

diff --git a/db/map_index.txt b/db/map_index.txt
index 15e01e270..9f6b22d7f 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -858,11 +858,7 @@ moc_prydn1
 moc_prydn2
 
 // ===============================
-<<<<<<< HEAD
 // New Maps added 2013-02-10
-=======
-// New Maps added 2013-02-10 (Thanks Streusel!)
->>>>>>> Maps
 // ===============================
 //iz_int
 //iz_int01
-- 
cgit v1.2.3-60-g2f50