diff options
Diffstat (limited to 'npc/000-0-0')
| -rw-r--r-- | npc/000-0-0/_import.txt | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt index 32699697..8f729fa7 100644 --- a/npc/000-0-0/_import.txt +++ b/npc/000-0-0/_import.txt @@ -1,8 +1,5 @@ map: 000-0-0.gat npc: npc/000-0-0/_mobs.txt npc: npc/000-0-0/_warps.txt -<<<<<<< HEAD npc: npc/000-0-0/mapflags.txt -======= ->>>>>>> ebc2b545ef01321b42f2c14f65ed3e466733d960 npc: npc/000-0-0/intro.txt |