diff options
author | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:47:28 -0300 |
---|---|---|
committer | Jesusaves <cpntb1@ymail.com> | 2020-05-24 13:47:28 -0300 |
commit | 9c322449ade0d1952f6ca4dd73cc92413f61ca69 (patch) | |
tree | 1bff0731c4db0790ef57a2d524d739b1241ffa2c /npc/test/_import.txt | |
parent | 9c649056dc45d39e88036bdb2bb373c477f8571f (diff) | |
parent | 255cf7c47f76a6e2f12fc809473ce513c294dfa4 (diff) | |
download | serverdata-jesusalva/inns.tar.gz serverdata-jesusalva/inns.tar.bz2 serverdata-jesusalva/inns.tar.xz serverdata-jesusalva/inns.zip |
Merge branch 'master' into jesusalva/innsjesusalva/inns
Diffstat (limited to 'npc/test/_import.txt')
-rw-r--r-- | npc/test/_import.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/test/_import.txt b/npc/test/_import.txt index 6c7f7e71..69324674 100644 --- a/npc/test/_import.txt +++ b/npc/test/_import.txt @@ -8,6 +8,5 @@ "npc/test/npc4.txt", "npc/test/npc5.txt", "npc/test/npc6.txt", -"npc/test/npcmarriage.txt", "npc/test/test1.txt", "npc/test/test2.txt", |