From fa1512d1a4993f4e92922a39c1f2c3367e73ca01 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 18 Mar 2021 10:22:58 -0400
Subject: [PATCH] Update robot.dm

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

diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 533975c8979..7db384ddc70 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1215,9 +1215,6 @@
 
 		if(current_selection_index) // Select what the player had before if possible.
 			select_module(current_selection_index)
-<<<<<<< HEAD
-=======
 
 /mob/living/silicon/robot/get_cell()
 	return cell
->>>>>>> f383438... Merge pull request #7935 from MistakeNot4892/tachikoma