From d4d052bae27ee4215761a32e2ee82f0b10b2969e Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 6 May 2018 03:10:20 -0400
Subject: [PATCH] Update radio.dm

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

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 718e5c8c1a..93f315a972 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -6,14 +6,8 @@
 	desc = "A basic handheld radio that communicates with local telecommunication networks."
 	dog_fashion = /datum/dog_fashion/back
 
-<<<<<<< HEAD
-	flags_1 = CONDUCT_1 | HEAR_1
-	flags_2 = NO_EMP_WIRES_2
-	slot_flags = SLOT_BELT
-=======
 	flags_1 = CONDUCT_1 | HEAR_1 | NO_EMP_WIRES_1
 	slot_flags = ITEM_SLOT_BELT
->>>>>>> fd4c753... replaces BANG_PROTECT_2 with a component, also kills OMNITONGUE_2 and flags_2  (#37597)
 	throw_speed = 3
 	throw_range = 7
 	w_class = WEIGHT_CLASS_SMALL