summaryrefslogtreecommitdiff
path: root/npc/011-4_Lake_cave
diff options
context:
space:
mode:
Diffstat (limited to 'npc/011-4_Lake_cave')
-rw-r--r--npc/011-4_Lake_cave/_warps.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/npc/011-4_Lake_cave/_warps.txt b/npc/011-4_Lake_cave/_warps.txt
index 7f1c1b2a..a6df0623 100644
--- a/npc/011-4_Lake_cave/_warps.txt
+++ b/npc/011-4_Lake_cave/_warps.txt
@@ -1,3 +1,9 @@
+<<<<<<< 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
@@ -11,3 +17,4 @@
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