From b969bb7eec490bab55586d4dbe675c143ad916f4 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Tue, 10 Oct 2017 00:04:20 -0500
Subject: [PATCH] Update data_huds.dm

---
 code/game/data_huds.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm
index 5e21527112..2cee1d595c 100644
--- a/code/game/data_huds.dm
+++ b/code/game/data_huds.dm
@@ -158,12 +158,7 @@
 /mob/living/carbon/med_hud_set_status()
 	var/image/holder = hud_list[STATUS_HUD]
 	var/icon/I = icon(icon, icon_state, dir)
-<<<<<<< HEAD
-	var/virus_state = check_virus()
-	var/mob/living/simple_animal/borer/B = has_brain_worms()
-=======
 	var/virus_threat = check_virus()
->>>>>>> db0c10e... Refactors virus spreading (#31066)
 	holder.pixel_y = I.Height() - world.icon_size
 	if(status_flags & XENO_HOST)
 		holder.icon_state = "hudxeno"