resolve merge conflicts

cmss13-devs · Feb 25, 2024 · 3b530eb · 3b530eb
1 parent 504b238
commit 3b530eb
Showing 1 changed file with 1 addition and 12 deletions.
diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm
@@ -18,12 +18,6 @@
 "ba" = (
 /obj/effect/attach_point/fuel/dropship2{
 	dir = 1;
-	pixel_x = -32
-	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/effect/attach_point/fuel/dropship2{
 	pixel_x = -32;
 	attach_id = 11
 	},
@@ -121,12 +115,7 @@
 /area/shuttle/drop2/sulaco)
 "gV" = (
 /obj/effect/attach_point/fuel/dropship2{
-	dir = 1
-	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
-/obj/effect/attach_point/fuel/dropship2{
+	dir = 1;
 	attach_id = 10
 	},
 /turf/closed/shuttle/dropship2/transparent{