summaryrefslogtreecommitdiff
path: root/npc/001-1_Tulimshar
diff options
context:
space:
mode:
authorStefan Beller <stefanbeller@googlemail.com>2011-01-05 17:23:33 +0100
committerStefan Beller <stefanbeller@googlemail.com>2011-01-05 17:42:12 +0100
commit28f9091d1d8819808f145dbbb08cf95af8139d29 (patch)
tree28c1e37d6dc90e12c95209b73306602be814738e /npc/001-1_Tulimshar
parentdc7c0909908eea9428960a82e76815cf1912a5d9 (diff)
downloadserverdata-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/001-1_Tulimshar')
-rw-r--r--npc/001-1_Tulimshar/_warps.txt14
1 files changed, 7 insertions, 7 deletions
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