hopes and prayers Update code/datums/ruins/lavaland.dm

Co-authored-by: Constellado <[email protected]> Signed-off-by: Yobrocharlie <[email protected]>
Constellado · Jul 31, 2024 · fa4ca03 · fa4ca03
1 parent f9a7e57
commit fa4ca03
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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"