From 28f9091d1d8819808f145dbbb08cf95af8139d29 Mon Sep 17 00:00:00 2001
From: Stefan Beller <stefanbeller@googlemail.com>
Date: Wed, 5 Jan 2011 17:23:33 +0100
Subject: repair the repo.

- removing the <<<<====>>>> unsolved merge conflicts
- reset some files, which are using CRLF(windows style) line ending to LF only (unix style)
- adding some comments to the csv files to not edit them manually but to use nice programs
---
 npc/_import.txt | 72 +++------------------------------------------------------
 1 file changed, 3 insertions(+), 69 deletions(-)

(limited to 'npc/_import.txt')

diff --git a/npc/_import.txt b/npc/_import.txt
index be7341a3..94929c05 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -1,70 +1,3 @@
-<<<<<<< HEAD
-import: npc/001-1_Tulimshar/_import.txt
-import: npc/001-2_Tulimshar/_import.txt
-import: npc/001-3_Tulimshar_arena/_import.txt
-import: npc/001-4_Omars_house/_import.txt
-import: npc/002-1_Sandstorm/_import.txt
-import: npc/002-3_Desert_mines/_import.txt
-import: npc/002-4_Desert_mines/_import.txt
-import: npc/003-1_Beach/_import.txt
-import: npc/003-2_Beach_House/_import.txt
-import: npc/004-1_Beach/_import.txt
-import: npc/004-2_Beach_House/_import.txt
-import: npc/005-1_Snake_desert/_import.txt
-import: npc/005-3_Snake_pit/_import.txt
-import: npc/006-1_Desert_mountains/_import.txt
-import: npc/006-3_Desert_mountain_caves/_import.txt
-import: npc/007-1_Woodland/_import.txt
-import: npc/008-1_Hurnscald_outskirts/_import.txt
-import: npc/009-1_Hurnscald/_import.txt
-import: npc/009-2_Hurnscald/_import.txt
-import: npc/009-3_Cave_beneath_Hurnscald/_import.txt
-import: npc/010-1_Woodland/_import.txt
-import: npc/010-2_Dimonds_Cove/_import.txt
-import: npc/011-1_Woodland/_import.txt
-import: npc/011-3_Hermits_cave/_import.txt
-import: npc/011-4_Lake_cave/_import.txt
-import: npc/011-5/_import.txt
-import: npc/012-1_Woodland_Hills/_import.txt
-import: npc/012-3_Cave/_import.txt
-import: npc/012-4_Cave/_import.txt
-import: npc/013-1_Woodland_hills/_import.txt
-import: npc/013-2_Magic_house/_import.txt
-import: npc/013-3_Cave/_import.txt
-import: npc/014-1_Woodland/_import.txt
-import: npc/014-3_Cave/_import.txt
-import: npc/015-1_Woodland/_import.txt
-import: npc/015-3_Cave/_import.txt
-import: npc/016-1_Woodland/_import.txt
-import: npc/017-1_Woodland_hills/_import.txt
-import: npc/017-2_Theater/_import.txt
-import: npc/017-9_Backstage/_import.txt
-import: npc/018-1_Woodland_mining_camp/_import.txt
-import: npc/018-2_Woodland_mining_camp/_import.txt
-import: npc/018-3_Cave/_import.txt
-import: npc/019-1_Snow_field/_import.txt
-import: npc/020-1_Nivalis/_import.txt
-import: npc/020-2_Nivalis/_import.txt
-import: npc/020-3_Ice_cave/_import.txt
-import: npc/020-4_Ice_cave/_import.txt
-import: npc/021-1_Tulimshar/_import.txt
-import: npc/021-2_Tulimshar/_import.txt
-import: npc/022-1_Tulimshar/_import.txt
-import: npc/024-1_Tulimshar_Canyon/_import.txt
-import: npc/024-2_Tulimshar_Magic_School/_import.txt
-import: npc/025-1_Woodland_Swamp/_import.txt
-import: npc/026-1_Swamp/_import.txt
-import: npc/027-1_Graveyard/_import.txt
-import: npc/027-2_Caretakers_House/_import.txt
-import: npc/027-3_Crypt/_import.txt
-import: npc/027-4_Reaper/_import.txt
-import: npc/028-1/_import.txt
-import: npc/028-3/_import.txt
-import: npc/029-1_Candor/_import.txt
-import: npc/029-3_Fight_Cave/_import.txt
-import: npc/botcheck/_import.txt
-import: npc/debugroom/_import.txt
-=======
 import: npc/001-1_Tulimshar/_import.txt
 import: npc/001-2_Tulimshar/_import.txt
 import: npc/001-3_Tulimshar_arena/_import.txt
@@ -124,7 +57,8 @@ import: npc/025-1_Woodland_Swamp/_import.txt
 import: npc/026-1_Swamp/_import.txt
 import: npc/027-1_Graveyard/_import.txt
 import: npc/027-2_Caretakers_House/_import.txt
-import: npc/027-3/_import.txt
+import: npc/027-3_Crypt/_import.txt
+import: npc/027-4_Inner_Chamber/_import.txt
 import: npc/028-1/_import.txt
 import: npc/028-3/_import.txt
 import: npc/029-1_Candor/_import.txt
@@ -136,4 +70,4 @@ import: npc/031-3_Cave/_import.txt
 import: npc/032-1_Outback/_import.txt
 import: npc/032-3_Cave/_import.txt
 import: npc/botcheck/_import.txt
->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b
+import: npc/debugroom_Woodland_mining_camp/_import.txt
-- 
cgit v1.2.3-60-g2f50