hopefully this will fix things

Constellado · Jul 31, 2024 · 643ce6d · 643ce6d
1 parent 0dc4d97
commit 643ce6d
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm
@@ -134,5 +134,4 @@
 	id = "crashed_star"
 	description = "A crashed pirate ship. It would seem that it's crew died a while ago."
 	suffix = "lavaland_crashed_starwalker.dmm"
-=======
->>>>>>> parent of f11a7aaaec (THE RUINCUT [AFFRONT TO GOD] (#3026))
+