Conflict fix

2026-08-26 05:27:39 +01:00 · 2025-03-29 19:45:52 +00:00
parent 6b15c2e428
commit e8b98f8c7a
3 changed files with 0 additions and 10 deletions
@@ -18188,16 +18188,6 @@
 	dir = 4
 	},
 /obj/structure/table/woodentable,
-/obj/machinery/librarycomp,
-/obj/merge_conflict_marker{
-	name = "---Merge Conflict Marker---";
-	
-	desc = "A best-effort merge was performed. You must resolve this conflict yourself (manually) and remove this object once complete."
-	},
-/obj/machinery/light{
-	dir = 4
-	},
-/obj/structure/table/woodentable,
 /obj/machinery/librarywikicomp,
 /turf/simulated/floor/wood,
 /area/library)