From e6aaad19217abe3e8ac873cf349bdbc940023f71 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sun, 17 Dec 2017 15:58:06 -0600
Subject: [PATCH] Update disease_outbreak.dm

---
 code/modules/events/disease_outbreak.dm | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm
index 1ade939ad3..dbde34d84d 100644
--- a/code/modules/events/disease_outbreak.dm
+++ b/code/modules/events/disease_outbreak.dm
@@ -18,16 +18,12 @@
 	announceWhen = rand(15, 30)
 
 /datum/round_event/disease_outbreak/start()
-<<<<<<< HEAD
-	if(!virus_type)
-=======
 	var/advanced_virus = FALSE
 	max_severity = 3 + max(FLOOR((world.time - control.earliest_start)/6000, 1),0) //3 symptoms at 20 minutes, plus 1 per 10 minutes
 	if(prob(20 + (10 * max_severity)))
 		advanced_virus = TRUE
 
 	if(!virus_type && !advanced_virus)
->>>>>>> 25080ff... defines math (#33498)
 		virus_type = pick(/datum/disease/dnaspread, /datum/disease/advance/flu, /datum/disease/advance/cold, /datum/disease/brainrot, /datum/disease/magnitis)
 
 	for(var/mob/living/carbon/human/H in shuffle(GLOB.alive_mob_list))
@@ -62,4 +58,4 @@
 			D = new virus_type()
 		D.carrier = TRUE
 		H.AddDisease(D)
-		break
\ No newline at end of file
+		break