summaryrefslogtreecommitdiff
path: root/npc/011-4_Lake_cave/_warps.txt
diff options
context:
space:
mode:
authornmaligec <wouldnot@hotmail.com>2011-01-05 00:34:26 -0500
committernmaligec <wouldnot@hotmail.com>2011-01-05 00:34:26 -0500
commited8cac19500c515cae40c1fd4b2d87abd96ae3ba (patch)
tree3136c4b4bac4db3a432384390efcc22f88ff2790 /npc/011-4_Lake_cave/_warps.txt
parent21156bed9c3d6eb3cf66a1e1557f4fc8c87a4194 (diff)
parent1e1e26e1255a487a14ca99c60c3ab51ad3988f9b (diff)
downloadserverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.gz
serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.bz2
serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.tar.xz
serverdata-ed8cac19500c515cae40c1fd4b2d87abd96ae3ba.zip
merging updates from previous test repo ta-testing.
Diffstat (limited to 'npc/011-4_Lake_cave/_warps.txt')
-rw-r--r--npc/011-4_Lake_cave/_warps.txt16
1 files changed, 16 insertions, 0 deletions
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt
index 6d255a4d..a6df0623 100644
--- a/npc/011-4_Lake_cave/_warps.txt
+++ b/npc/011-4_Lake_cave/_warps.txt
@@ -1,4 +1,20 @@
+<<<<<<< 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
+011-4.gat,129,86 warp ToCaveBeneathHurnscald -1,-1,009-3.gat,21,55
+011-4.gat,39,35 warp warp -1,-1,011-6.gat,47,183
+011-4.gat,16,57 warp warp -1,-1,011-6.gat,24,204
+011-4.gat,89,20 warp warp -1,-1,011-6.gat,97,168
+011-4.gat,105,32 warp warp -1,-1,011-6.gat,113,184
+011-4.gat,114,61 warp warp -1,-1,011-6.gat,122,213
+011-4.gat,86,75 warp warp -1,-1,011-6.gat,94,227
+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