fixes map conflicts

2017-12-10 18:17:25 -05:00
parent 3b665e6af1
commit 3a8c2b3be0
1 changed files with 0 additions and 3 deletions
@@ -80772,8 +80772,6 @@
 "EDC" = (
 /turf/closed/wall/mineral/plastitanium,
 /area/engine/break_room)
-<<<<<<< HEAD
-=======
 "EDD" = (
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
@@ -80810,7 +80808,6 @@
 /obj/machinery/droneDispenser,
 /turf/open/floor/plating,
 /area/maintenance/aft)
->>>>>>> d784e2d... [Metastation] Moves drone dispenser to Robotics maint (#33267)

 (1,1,1) = {"
 aaa