From 1d4e3612ea099251072076660e0a5e521766ecb2 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 22 Nov 2017 17:56:49 -0500
Subject: [PATCH] Update PDA.dm

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

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 8e52483cba..4eebb60195 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -155,15 +155,12 @@ GLOBAL_LIST_EMPTY(PDAs)
 	return
 
 /obj/item/device/pda/attack_self(mob/user)
-<<<<<<< HEAD
-=======
 	if(!user.IsAdvancedToolUser())
 		to_chat(user, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return
 
 	. = ..()
 
->>>>>>> ccd4981... Merge pull request #32624 from kevinz000/component_uplinks
 	var/datum/asset/assets = get_asset_datum(/datum/asset/simple/pda)
 	assets.send(user)