summaryrefslogtreecommitdiff
path: root/npc/006-1_Desert_mountains/_import.txt
diff options
context:
space:
mode:
authorFate <fate-tmw@googlemail.com>2008-12-27 22:23:10 -0700
committerFate <fate-tmw@googlemail.com>2008-12-27 22:23:10 -0700
commit781b8bbd160edf9a677fdd8075739ef378b6d57d (patch)
tree523df5aa765d59294e6390c74e8aec0081c074f3 /npc/006-1_Desert_mountains/_import.txt
parentaacf6527a0ae9d440f9271906400825c9722275f (diff)
parent2ac5a7006c550c5ee85d3070b07bdb327ff83ec1 (diff)
downloadserverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.tar.gz
serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.tar.bz2
serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.tar.xz
serverdata-781b8bbd160edf9a677fdd8075739ef378b6d57d.zip
Merge branch 'master' into magic
Diffstat (limited to 'npc/006-1_Desert_mountains/_import.txt')
-rw-r--r--npc/006-1_Desert_mountains/_import.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
index aa3a86de..4b1bddea 100644
--- a/npc/006-1_Desert_mountains/_import.txt
+++ b/npc/006-1_Desert_mountains/_import.txt
@@ -2,5 +2,4 @@ map: 006-1.gat
npc: npc/006-1_Desert_mountains/_mobs.txt
npc: npc/006-1_Desert_mountains/_warps.txt
npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/monsters.txt
npc: npc/006-1_Desert_mountains/pachua.txt