From f36b07371f78287f44a859586924d1d21c1017c3 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 6 Jan 2018 10:23:08 -0600
Subject: [PATCH] Update datum_traitor.dm

---
 code/datums/antagonists/datum_traitor.dm | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm
index de15e9c034..a12cf80da7 100644
--- a/code/datums/antagonists/datum_traitor.dm
+++ b/code/datums/antagonists/datum_traitor.dm
@@ -305,19 +305,11 @@
 	var/TC_uses = 0
 	var/uplink_true = FALSE
 	var/purchases = ""
-<<<<<<< HEAD
-	for(var/datum/component/uplink/H in GLOB.uplinks)
-		if(H && H.owner && H.owner == owner.key)
-			TC_uses += H.spent_telecrystals
-			uplink_true = TRUE
-			purchases += H.purchase_log.generate_render(FALSE)
-=======
 	var/datum/uplink_purchase_log/H = GLOB.uplink_purchase_logs_by_key[owner.key]
 	if(H)
 		TC_uses = H.total_spent
 		uplink_true = TRUE
 		purchases += H.generate_render(FALSE)
->>>>>>> cb62dc9... Fixes some antags missing from roundend report (#34114)
 
 	var/objectives_text = ""
 	if(objectives.len)//If the traitor had no objectives, don't need to process this.
@@ -351,4 +343,4 @@
 
 /datum/antagonist/traitor/roundend_report_footer()
 	return "<br><b>The code phrases were:</b> <span class='codephrase'>[GLOB.syndicate_code_phrase]</span><br>\
-		<b>The code responses were:</b> <span class='codephrase'>[GLOB.syndicate_code_response]</span><br>"
\ No newline at end of file
+		<b>The code responses were:</b> <span class='codephrase'>[GLOB.syndicate_code_response]</span><br>"