From 3ee08632d23c9ec8094d35424194a4dea15c7fa6 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 9 Oct 2017 21:37:24 -0500
Subject: [PATCH] Update traitor.dm

---
 code/game/gamemodes/traitor/traitor.dm | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/code/game/gamemodes/traitor/traitor.dm b/code/game/gamemodes/traitor/traitor.dm
index 71a4b8a25b..9e62d13a3e 100644
--- a/code/game/gamemodes/traitor/traitor.dm
+++ b/code/game/gamemodes/traitor/traitor.dm
@@ -118,19 +118,9 @@
 							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font> <font color='grey'>(Optional)</font>"
 							SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
 					else
-<<<<<<< HEAD
-						if(objective.check_completion())
-							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='green'><B>Success!</B></font>"
-							SSblackbox.add_details("traitor_objective","[objective.type]|SUCCESS")
-						else
-							objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
-							SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
-							traitorwin = 0
-=======
 						objectives += "<br><B>Objective #[count]</B>: [objective.explanation_text] <font color='red'>Fail.</font>"
 						SSblackbox.add_details("traitor_objective","[objective.type]|FAIL")
 						traitorwin = FALSE
->>>>>>> b9e981a... Removes a spawn from traitor code (#31465)
 					count++
 
 			if(uplink_true)