summaryrefslogtreecommitdiff
path: root/conf/maps.conf
diff options
context:
space:
mode:
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