summaryrefslogtreecommitdiff
path: root/npc/027-3_Crypt/_warps.txt
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/027-3_Crypt/_warps.txt
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/027-3_Crypt/_warps.txt')
-rwxr-xr-xnpc/027-3_Crypt/_warps.txt8
1 files changed, 3 insertions, 5 deletions
diff --git a/npc/027-3_Crypt/_warps.txt b/npc/027-3_Crypt/_warps.txt
index 295215ca..5bbff7ae 100755
--- a/npc/027-3_Crypt/_warps.txt
+++ b/npc/027-3_Crypt/_warps.txt
@@ -1,5 +1,3 @@
-// 027-3 Crypt warps
-
-027-3.gat,126,44,0 warp ToReaperL -1,-1,027-4.gat,36,21
-027-3.gat,127,44,0 warp ToReaperM -1,-1,027-4.gat,37,21
-027-3.gat,128,44,0 warp ToReaperR -1,-1,027-4.gat,38,21 \ No newline at end of file
+// 027-3 Crypt warps
+
+027-3.gat,127,44 warp toCryptLevel2 1,-1,027-4.gat,37,21