diff --git a/world/world_105_115 b/world/world_105_115 index e546bb53a..efccd8e9b 100644 --- a/world/world_105_115 +++ b/world/world_105_115 @@ -1657,11 +1657,6 @@ x 3 y 43 speed_left -94.099998 end -arch fountain -x 3 -y 43 -speed_left -94.099998 -end arch dungeon_magic x 3 y 44 @@ -1721,6 +1716,7 @@ x 3 y 48 elevation 10832 <<<<<<< HEAD +<<<<<<< HEAD end arch fountain x 3 @@ -1733,6 +1729,8 @@ arch fountain x 3 y 48 speed_left -94.099998 +======= +>>>>>>> 936034922 (Add missing elevation) end arch fountain x 3