summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
authorBen Longbons <b.r.longbons@gmail.com>2011-06-17 12:42:55 -0700
committerBen Longbons <b.r.longbons@gmail.com>2011-06-17 12:42:55 -0700
commit41f812b10e7bf148517447943e090006614872dc (patch)
tree58b52fd0cbd71b4b808d37d4de2718a7dbeca1ba /npc
parentdb53017bd8172d7679b2ce3e7cc6c67927031f2c (diff)
downloadserverdata-41f812b10e7bf148517447943e090006614872dc.tar.gz
serverdata-41f812b10e7bf148517447943e090006614872dc.tar.bz2
serverdata-41f812b10e7bf148517447943e090006614872dc.tar.xz
serverdata-41f812b10e7bf148517447943e090006614872dc.zip
Fix faulty merge after folder rename
Diffstat (limited to 'npc')
-rw-r--r--npc/022-1/_import.txt15
1 files changed, 8 insertions, 7 deletions
diff --git a/npc/022-1/_import.txt b/npc/022-1/_import.txt
index 8f72cbc0..90731e26 100644
--- a/npc/022-1/_import.txt
+++ b/npc/022-1/_import.txt
@@ -1,9 +1,10 @@
+// Map 022-1: Tulimshar
// This file is generated automatically. All manually changes will be removed when running the Converter.
map: 022-1.gat
-npc: npc/022-1_Tulimshar/_mobs.txt
-npc: npc/022-1_Tulimshar/_warps.txt
-npc: npc/022-1_Tulimshar/dock.txt
-npc: npc/022-1_Tulimshar/elanore.txt
-npc: npc/022-1_Tulimshar/ferry_master.txt
-npc: npc/022-1_Tulimshar/mapflags.txt
-npc: npc/022-1_Tulimshar/tutorial.txt
+npc: npc/022-1/_mobs.txt
+npc: npc/022-1/_warps.txt
+npc: npc/022-1/dock.txt
+npc: npc/022-1/elanore.txt
+npc: npc/022-1/ferry_master.txt
+npc: npc/022-1/mapflags.txt
+npc: npc/022-1/tutorial.txt