From 32eb36ba25f63bb37522c923d3f1f902ebf6d3cf Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Sat, 4 Jul 2020 08:57:04 -0400
Subject: [PATCH] Update mob_defines.dm

---
 code/modules/mob/mob_defines.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 511073270f..ae2b5408c5 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -224,8 +224,4 @@
 
 	var/registered_z
 
-<<<<<<< HEAD
-	var/list/progressbars = null //for stacking do_after bars
-=======
 	var/in_enclosed_vehicle = 0	//For mechs and fighters ambiance. Can be used in other cases.
->>>>>>> ce9ceb4... Add clickable action buttons from /TG/, rework a lot of backend and other improvements. (#7315)