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/011-3_Hermits_cave/_warps.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'npc/011-3_Hermits_cave') diff --git a/npc/011-3_Hermits_cave/_warps.txt b/npc/011-3_Hermits_cave/_warps.txt index b2efd78b..be9b6a83 100644 --- a/npc/011-3_Hermits_cave/_warps.txt +++ b/npc/011-3_Hermits_cave/_warps.txt @@ -1,3 +1,3 @@ -// 011-3 Hermit's cave warps - -011-3.gat,31,21 warp ToLakeCave -1,-1,011-4.gat,72,10 +// 011-3 Hermit's cave warps + +011-3.gat,31,21 warp ToLakeCave -1,-1,011-4.gat,72,11 -- cgit v1.2.3-60-g2f50