From 41f812b10e7bf148517447943e090006614872dc Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Fri, 17 Jun 2011 12:42:55 -0700 Subject: Fix faulty merge after folder rename --- npc/022-1/_import.txt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'npc') 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 -- cgit v1.2.3-60-g2f50