From 7b815bd59401d2a116f85bf0f360e1e4eae6d9bb Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 21 Jan 2020 01:23:57 -0500
Subject: [PATCH] Update radio.dm

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

diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index bb8d4af636..40dc7bb1f7 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -25,14 +25,9 @@ var/global/list/default_medbay_channels = list(
 //VOREStation Edit End
 
 /obj/item/device/radio
-<<<<<<< HEAD
 	icon = 'icons/obj/radio_vr.dmi' //VOREStation Edit
 	name = "shortwave radio" //VOREStation Edit
-=======
-	icon = 'icons/obj/radio.dmi'
-	name = "station bounced radio"
 	desc = "Used to talk to people when headsets don't function. Range is limited."
->>>>>>> 5d5e361... Merge pull request #6621 from Shadow-Quill/Desc-Adds
 	suffix = "\[3\]"
 	icon_state = "walkietalkie"
 	item_state = "radio"