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

---
 code/datums/uplink_items.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/datums/uplink_items.dm b/code/datums/uplink_items.dm
index cd51838309..43abd72f16 100644
--- a/code/datums/uplink_items.dm
+++ b/code/datums/uplink_items.dm
@@ -91,10 +91,6 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
 
 /datum/uplink_item/proc/spawn_item(turf/loc, datum/component/uplink/U, mob/user)
 	if(item)
-<<<<<<< HEAD:code/modules/uplink/uplink_item.dm
-		SSblackbox.add_details("traitor_uplink_items_bought", "[name]|[cost]")
-=======
->>>>>>> ccd4981... Merge pull request #32624 from kevinz000/component_uplinks:code/datums/uplink_items.dm
 		return new item(loc)
 
 /datum/uplink_item/Destroy()