From 143909a855fac59d8f6713518bf50dbb37a23149 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Fri, 2 Mar 2018 21:32:07 -0500
Subject: [PATCH] Update examine.dm

---
 code/modules/mob/living/carbon/human/examine.dm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 5c14c2cf02..82706b46ee 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -323,14 +323,13 @@
 						msg += "<a href='?src=[REF(src)];hud=s;add_crime=1'>\[Add crime\]</a> "
 						msg += "<a href='?src=[REF(src)];hud=s;view_comment=1'>\[View comment log\]</a> "
 						msg += "<a href='?src=[REF(src)];hud=s;add_comment=1'>\[Add comment\]</a>\n"
-<<<<<<< HEAD
+
+	else if(isobserver(user) && traitstring)
+		msg += "<span class='info'><b>Traits:</b> [traitstring]</span><br>"
+
 	if(print_flavor_text() && get_visible_name() != "Unknown")//Are we sure we know who this is? Don't show flavor text unless we can recognize them. Prevents certain metagaming with impersonation.
 		msg += "[print_flavor_text()]\n"
 		
-=======
-	else if(isobserver(user) && traitstring)
-		msg += "<span class='info'><b>Traits:</b> [traitstring]</span><br>"
->>>>>>> ab9e2e8... Adds minor roundstart traits! (ala CDDA, etc.) (#35440)
 	msg += "*---------*</span>"
 
 	to_chat(user, msg)