From 529eaa6aca2b8760623133f08d8c29ac34ba1a93 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 22 Oct 2017 10:51:11 -0500
Subject: [PATCH] Update player_panel.dm

---
 code/modules/admin/player_panel.dm | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 6909f15c3f..1a931bc291 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -593,19 +593,8 @@
 		var/list/blob_minds = list()
 		for(var/mob/camera/blob/B in GLOB.mob_list)
 			blob_minds |= B.mind
-<<<<<<< HEAD
-
-		if(istype(SSticker.mode, /datum/game_mode/blob) || blob_minds.len)
-			dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
-			if(istype(SSticker.mode, /datum/game_mode/blob))
-				var/datum/game_mode/blob/mode = SSticker.mode
-				blob_minds |= mode.blob_overminds
-				dat += "<tr><td><i>Progress: [GLOB.blobs_legit.len]/[mode.blobwincount]</i></td></tr>"
-
-=======
 			if(blob_minds.len)
 				dat += "<br><table cellspacing=5><tr><td><B>Blob</B></td><td></td><td></td></tr>"
->>>>>>> 7034a22... Blob fixes (#31913)
 			for(var/datum/mind/blob in blob_minds)
 				var/mob/M = blob.current
 				if(M)