From 28f9091d1d8819808f145dbbb08cf95af8139d29 Mon Sep 17 00:00:00 2001 From: Stefan Beller 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/001-1_Tulimshar/_warps.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'npc/001-1_Tulimshar/_warps.txt') diff --git a/npc/001-1_Tulimshar/_warps.txt b/npc/001-1_Tulimshar/_warps.txt index 4e293337..e3778fff 100644 --- a/npc/001-1_Tulimshar/_warps.txt +++ b/npc/001-1_Tulimshar/_warps.txt @@ -1,7 +1,7 @@ -// 001-1 Tulimshar warps - -001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 -001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 -001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 -001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 -001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,26,33 +// 001-1 Tulimshar warps + +001-1.gat,44,88 warp ToSandstorm 3,-1,002-1.gat,58,17 +001-1.gat,44,20 warp toCentralTulimshar 3,-1,021-1.gat,55,145 +001-1.gat,125,20 warp toCentralTulimshar 0,-1,021-1.gat,136,146 +001-1.gat,32,71 warp ToInn -1,-1,001-2.gat,25,34 +001-1.gat,75,41 warp ToHouse -1,-1,001-4.gat,26,33 -- cgit v1.2.3-60-g2f50