From c9211bca1629827795e175d66bf52d1ec851f697 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 26 Nov 2017 21:36:10 -0500
Subject: [PATCH] Update multitool.dm

---
 code/game/objects/items/devices/multitool.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index b38e872ba3..4db8cdaa24 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -160,9 +160,6 @@
 	desc = "An omni-technological interface."
 	icon = 'icons/obj/abductor.dmi'
 	icon_state = "multitool"
-<<<<<<< HEAD
 	toolspeed = 0.1
 	origin_tech = "magnets=5;engineering=5;abductor=3"
-=======
 	toolspeed = 0.1
->>>>>>> 0d2955e... More integrated circuit fixes and code improvements (#33034)