Update MetaStation.dmm

Fluffy-Frontier · Nov 21, 2023 · cf9d216 · cf9d216
1 parent 8df060b
commit cf9d216
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -57842,13 +57842,9 @@
 	dir = 4;
 	id = "garbage"
 	},
-<<<<<<< HEAD
-/obj/machinery/recycler,
-=======
 /obj/machinery/recycler{
 	dir = 8
 	},
->>>>>>> aa15c5e6b ([MIRROR] Enzyme (var) exorcism in Metastation [MDB IGNORE] (#25130))
 /turf/open/floor/plating,
 /area/station/maintenance/disposal)
 "uEO" = (
@@ -67639,13 +67635,8 @@
 	pixel_y = 6
 	},
 /obj/item/reagent_containers/condiment/enzyme{
-<<<<<<< HEAD
-	layer = 5;
-	pixel_x = -6
-=======
 	pixel_x = -6;
 	pixel_y = 5
->>>>>>> aa15c5e6b ([MIRROR] Enzyme (var) exorcism in Metastation [MDB IGNORE] (#25130))
 	},
 /turf/open/floor/iron/cafeteria,
 /area/station/service/kitchen)