diff options
| author | Saulc <lucashelaine14@gmail.com> | 2018-08-29 09:04:50 +0000 |
|---|---|---|
| committer | Saulc <lucashelaine14@gmail.com> | 2018-08-29 09:04:50 +0000 |
| commit | 5f62243a1da032521de53876005112d5e6e36a19 (patch) | |
| tree | 239bbf17a37b22cd54b3199a35b7f8b7b6562594 /npc/004-1 | |
| parent | 6a7b0e863b2b03b213d9c6a31b906e085ed7f66e (diff) | |
| parent | a6a5dd189d037b2d453df7ed7c312d59c79a3636 (diff) | |
| download | serverdata-5f62243a1da032521de53876005112d5e6e36a19.tar.gz serverdata-5f62243a1da032521de53876005112d5e6e36a19.tar.bz2 serverdata-5f62243a1da032521de53876005112d5e6e36a19.tar.xz serverdata-5f62243a1da032521de53876005112d5e6e36a19.zip | |
Merge branch 'master' into 'master'
# Conflicts:
# db/quest_db.conf
# npc/004-1/_import.txt
# npc/007-1/_import.txt
# npc/007-1/tycoon.txt
Diffstat (limited to 'npc/004-1')
| -rw-r--r-- | npc/004-1/_import.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/004-1/_import.txt b/npc/004-1/_import.txt index a98e3d86b..d8897b37d 100644 --- a/npc/004-1/_import.txt +++ b/npc/004-1/_import.txt @@ -2,5 +2,4 @@ // This file is generated automatically. All manually added changes will be removed when running the Converter. "npc/004-1/_mobs.txt", "npc/004-1/_warps.txt", -"npc/004-1/anwar.txt", "npc/004-1/elanore.txt", |