Update robot_items.dm

2017-10-13 22:30:41 -05:00
parent bd7a0d65b5
commit de20eb645c
1 changed files with 0 additions and 5 deletions
@@ -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