From fa4ca0398e19395d3332a3d34633632cec755ed1 Mon Sep 17 00:00:00 2001
From: Yobrocharlie <126765898+Yobrocharlie@users.noreply.github.com>
Date: Tue, 30 Jul 2024 21:06:31 -0700
Subject: [PATCH] hopes and prayers Update code/datums/ruins/lavaland.dm

Co-authored-by: Constellado <64122807+Constellado@users.noreply.github.com>
Signed-off-by: Yobrocharlie <126765898+Yobrocharlie@users.noreply.github.com>
---
 code/datums/ruins/lavaland.dm | 1 -
 1 file changed, 1 deletion(-)

diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
index aa7ea479cdcbf..8581fbba1dff4 100644
--- a/code/datums/ruins/lavaland.dm
+++ b/code/datums/ruins/lavaland.dm
@@ -121,7 +121,6 @@
 	id = "lava_canyon"
 	description = "Tectonic activity has gouged a large fissure into the surface of the planet here. Tucked in the crevasse, the remains of an ashwalker village lay in ashes."
 	suffix = "lavaland_surface_lava_canyon.dmm"
-<<<<<<< HEAD
 
 /datum/map_template/ruin/lavaland/wrecked_factory
 	name = "Wrecked Factory"