From de20eb645c2a5f469e5bde78a92983081b41a605 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 13 Oct 2017 22:30:41 -0500
Subject: [PATCH] Update robot_items.dm

---
 code/game/objects/items/robot/robot_items.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 2a9e6d0114..b061c5d531 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -274,13 +274,8 @@
 		to_chat(user, "<span class='notice'>You stop charging [target].</span>")
 
 /obj/item/device/harmalarm
-<<<<<<< HEAD
-	name = "Sonic Harm Prevention Tool"
-	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
-=======
 	name = "\improper Sonic Harm Prevention Tool"
 	desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH."
->>>>>>> 7998a3c... Merge pull request #31601 from AutomaticFrenzy/patch/thethe
 	icon_state = "megaphone"
 	var/cooldown = 0