diff options
| author | Reid <reidyaro@gmail.com> | 2011-12-29 00:12:11 +0100 |
|---|---|---|
| committer | Reid <reidyaro@gmail.com> | 2011-12-29 00:12:11 +0100 |
| commit | e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b (patch) | |
| tree | e6a3c8d5d60e71c06d4909624b41902afb39d1c7 /npc/000-0-0 | |
| parent | 0903e92ca953782e6022d3139c839e92b5016e2f (diff) | |
| download | serverdata-e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b.tar.gz serverdata-e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b.tar.bz2 serverdata-e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b.tar.xz serverdata-e249e6d5d7c75720486bb85f1ec9c4ae4ec4444b.zip | |
Add back _import.txt .
Diffstat (limited to 'npc/000-0-0')
| -rw-r--r-- | npc/000-0-0/_import.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/npc/000-0-0/_import.txt b/npc/000-0-0/_import.txt index 8f729fa7..32699697 100644 --- a/npc/000-0-0/_import.txt +++ b/npc/000-0-0/_import.txt @@ -1,5 +1,8 @@ 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 |