From 1dddcb5d83f18a9e6b645543f2d2fb18d11de778 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Mon, 20 Nov 2017 22:28:29 -0500
Subject: [PATCH] Update beesease.dm

---
 code/datums/diseases/beesease.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/datums/diseases/beesease.dm b/code/datums/diseases/beesease.dm
index 5235766392..f02c3b90ee 100644
--- a/code/datums/diseases/beesease.dm
+++ b/code/datums/diseases/beesease.dm
@@ -35,10 +35,4 @@
 				affected_mob.visible_message("<span class='danger'>[affected_mob] coughs up a swarm of bees!</span>", \
 													"<span class='userdanger'>You cough up a swarm of bees!</span>")
 				new /mob/living/simple_animal/hostile/poison/bees(affected_mob.loc)
-<<<<<<< HEAD
-		//if(5)
-		//Plus if you die, you explode into bees
 	return
-=======
-	return
->>>>>>> b7a9a2a... Merge pull request #32844 from ShizCalev/code-cleanup