diff options
| author | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2019-08-18 15:05:32 -0300 |
| commit | c9173a4e2e55b0fdf4df0d99920c556548a81e4b (patch) | |
| tree | 885d66f5e10289843fa71a4316fe49a454c47c01 /npc/_import.txt | |
| parent | 9222961a0b3b38aee2f01a1d53c8a08e174488e2 (diff) | |
| parent | 7c8417bb63afb65516852da1b9eb8ff0b4d2877f (diff) | |
| download | serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.gz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.bz2 serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.tar.xz serverdata-c9173a4e2e55b0fdf4df0d99920c556548a81e4b.zip | |
Merge branch 'master' into testserver
Conflicts solved with -X theirs
Diffstat (limited to 'npc/_import.txt')
| -rw-r--r-- | npc/_import.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/npc/_import.txt b/npc/_import.txt index e004b6aaf..d568e0aaf 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -98,6 +98,7 @@ @include "npc/016-6/_import.txt" @include "npc/016-7/_import.txt" @include "npc/017-1/_import.txt" +@include "npc/017-10/_import.txt" @include "npc/017-2-1/_import.txt" @include "npc/017-2-2/_import.txt" @include "npc/017-2/_import.txt" |