diff options
Diffstat (limited to 'db')
| -rw-r--r-- | db/map_index.txt | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/db/map_index.txt b/db/map_index.txt index 9f6b22d7f..15e01e270 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -858,7 +858,11 @@ moc_prydn1 moc_prydn2 // =============================== +<<<<<<< HEAD // New Maps added 2013-02-10 +======= +// New Maps added 2013-02-10 (Thanks Streusel!) +>>>>>>> Maps // =============================== //iz_int //iz_int01 |