diff options
| -rw-r--r-- | conf/maps.conf | 4 | ||||
| -rw-r--r-- | db/map_index.txt | 4 |
2 files changed, 0 insertions, 8 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 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 |