summaryrefslogtreecommitdiff
path: root/npc/001-2_Tulimshar/_import.txt
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2009-09-18 20:34:18 +0000
committerFate <fate-tmw@googlemail.com>2009-09-18 20:34:18 +0000
commit0738d6d97334d9127007e06bac87f23f4170534c (patch)
tree9df7182f023ce8c1500e4fd7377339e6c5cc5985 /npc/001-2_Tulimshar/_import.txt
parentd1ac0ab81128a774a94d821fff331e6517d3471b (diff)
parent2f931153d914a90b3be73665a90251706f2b3170 (diff)
downloadserverdata-0738d6d97334d9127007e06bac87f23f4170534c.tar.gz
serverdata-0738d6d97334d9127007e06bac87f23f4170534c.tar.bz2
serverdata-0738d6d97334d9127007e06bac87f23f4170534c.tar.xz
serverdata-0738d6d97334d9127007e06bac87f23f4170534c.zip
Merge branch 'master' of gitorious.org:tmw-eathena-data/mainline
Diffstat (limited to 'npc/001-2_Tulimshar/_import.txt')
-rw-r--r--npc/001-2_Tulimshar/_import.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/001-2_Tulimshar/_import.txt b/npc/001-2_Tulimshar/_import.txt
index 99123cba..6b8f78b6 100644
--- a/npc/001-2_Tulimshar/_import.txt
+++ b/npc/001-2_Tulimshar/_import.txt
@@ -2,7 +2,6 @@ map: 001-2.gat
npc: npc/001-2_Tulimshar/_mobs.txt
npc: npc/001-2_Tulimshar/_warps.txt
npc: npc/001-2_Tulimshar/casino.txt
-npc: npc/001-2_Tulimshar/omar.txt
npc: npc/001-2_Tulimshar/phaet.txt
npc: npc/001-2_Tulimshar/shops.txt
npc: npc/001-2_Tulimshar/troupe_leader.txt