summaryrefslogtreecommitdiff
path: root/conf/maps.conf
diff options
context:
space:
mode:
authorMysteries <mysteriousragnarok@hotmail.com>2013-02-10 23:57:23 -0500
committerMysteries <mysteriousragnarok@hotmail.com>2013-02-10 23:57:23 -0500
commit57e430222f9e2c49f9a26bde4219e363459316fb (patch)
treebfc4ebfa4b86016aed782e2fa09c5c09d911ef44 /conf/maps.conf
parentabd09b2583a6d72c0012e0d5e0c4051b274dd3d9 (diff)
downloadhercules-57e430222f9e2c49f9a26bde4219e363459316fb.tar.gz
hercules-57e430222f9e2c49f9a26bde4219e363459316fb.tar.bz2
hercules-57e430222f9e2c49f9a26bde4219e363459316fb.tar.xz
hercules-57e430222f9e2c49f9a26bde4219e363459316fb.zip
Revert "Maps"
This reverts commit abd09b2583a6d72c0012e0d5e0c4051b274dd3d9.
Diffstat (limited to 'conf/maps.conf')
-rw-r--r--conf/maps.conf4
1 files changed, 0 insertions, 4 deletions
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