From 5ea36b7a60d30416d5fb242e8411f09c61651ec8 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Mon, 17 Feb 2020 01:29:20 -0500
Subject: [PATCH] Update robot_movement.dm

---
 code/modules/mob/living/silicon/robot/robot_movement.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/living/silicon/robot/robot_movement.dm b/code/modules/mob/living/silicon/robot/robot_movement.dm
index 6d08417a6e2..858741988e1 100644
--- a/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -32,8 +32,6 @@
 	var/datum/robot_component/actuator/A = get_component("actuator")
 	if (cell_use_power(A.active_usage))
 		return ..()
-<<<<<<< HEAD
-=======
 
 /mob/living/silicon/robot/Move(a, b, flag)
 
@@ -84,4 +82,3 @@
 			if(isturf(tile))
 				B.gather_all(tile, src, 1) //Shhh, unless the bag fills, don't spam the borg's chat with stuff that's going on every time they move!
 	return
->>>>>>> a862d55... Fixes mining borg ore box movement on sand with a mining satchel equipped (#6693)