From 3a8c2b3be0191563286951e45de3726ae6661a15 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 10 Dec 2017 18:17:25 -0500
Subject: [PATCH] fixes map conflicts

---
 _maps/map_files/MetaStation/MetaStation.dmm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 927fd2eb8c..46dc883625 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -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