From 3790df44e51a68ae7a93d4fd13251752b5ae780a Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Sun, 25 Feb 2018 13:24:44 -0800
Subject: [PATCH 1/2] Fix bogus var access

---
 code/game/gamemodes/game_mode.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 06c1b4fb18..5283ca29bb 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -373,6 +373,12 @@
 	var/msg = "<span class='boldnotice'>Roundstart logout report\n\n</span>"
 	for(var/i in GLOB.mob_living_list)
 		var/mob/living/L = i
+<<<<<<< HEAD
+=======
+		var/mob/living/carbon/C = L
+		if (istype(C) && !C.last_mind)
+			continue  // never had a client
+>>>>>>> e8acf67... Fix bogus var access (#35977)
 
 		if(L.ckey && !GLOB.directory[L.ckey])
 			msg += "<b>[L.name]</b> ([L.ckey]), the [L.job] (<font color='#ffcc00'><b>Disconnected</b></font>)\n"

From c7760707e68e6596af24510289430b6f7f17c65d Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Sun, 25 Feb 2018 16:43:54 -0500
Subject: [PATCH 2/2] Update game_mode.dm

---
 code/game/gamemodes/game_mode.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 5283ca29bb..56a929089d 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -373,12 +373,9 @@
 	var/msg = "<span class='boldnotice'>Roundstart logout report\n\n</span>"
 	for(var/i in GLOB.mob_living_list)
 		var/mob/living/L = i
-<<<<<<< HEAD
-=======
 		var/mob/living/carbon/C = L
 		if (istype(C) && !C.last_mind)
 			continue  // never had a client
->>>>>>> e8acf67... Fix bogus var access (#35977)
 
 		if(L.ckey && !GLOB.directory[L.ckey])
 			msg += "<b>[L.name]</b> ([L.ckey]), the [L.job] (<font color='#ffcc00'><b>Disconnected</b></font>)\n"
@@ -480,4 +477,4 @@
 	if(EMERGENCY_ESCAPED_OR_ENDGAMED)
 		SSticker.news_report = STATION_EVACUATED
 		if(SSshuttle.emergency.is_hijacked())
-			SSticker.news_report = SHUTTLE_HIJACK
\ No newline at end of file
+			SSticker.news_report = SHUTTLE_HIJACK