diff options
| author | Stefan Beller <stefanbeller@googlemail.com> | 2011-01-05 17:23:33 +0100 |
|---|---|---|
| committer | Stefan Beller <stefanbeller@googlemail.com> | 2011-01-05 17:42:12 +0100 |
| commit | 28f9091d1d8819808f145dbbb08cf95af8139d29 (patch) | |
| tree | 28c1e37d6dc90e12c95209b73306602be814738e /npc/011-4_Lake_cave | |
| parent | dc7c0909908eea9428960a82e76815cf1912a5d9 (diff) | |
| download | serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.gz serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.bz2 serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.tar.xz serverdata-28f9091d1d8819808f145dbbb08cf95af8139d29.zip | |
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
Diffstat (limited to 'npc/011-4_Lake_cave')
| -rw-r--r-- | npc/011-4_Lake_cave/_warps.txt | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt index a6df0623..7f1c1b2a 100644 --- a/npc/011-4_Lake_cave/_warps.txt +++ b/npc/011-4_Lake_cave/_warps.txt @@ -1,9 +1,3 @@ -<<<<<<< HEAD -// 011-4 Lake cave warps
-
-011-4.gat,73,8 warp ToHermitsCave 0,-1,011-3.gat,31,23
-011-4.gat,129,86 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,21,55
-======= // 011-4 Lake cave warps 011-4.gat,73,8 warp ToHermitsCave 0,-1,011-3.gat,31,24 @@ -17,4 +11,3 @@ 011-4.gat,62,86 warp warp -1,-1,011-6.gat,68,233 011-4.gat,32,5 warp warp 0,-1,011-6.gat,186,180 011-4.gat,45,118 warp warp -1,-1,011-6.gat,266,180 ->>>>>>> 1e1e26e1255a487a14ca99c60c3ab51ad3988f9b |