Update multitool.dm

2017-11-26 21:36:10 -05:00
parent 0be326633d
commit c9211bca16
1 changed files with 0 additions and 3 deletions
@@ -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)