From cf0896f9042cdb4e26626acae9a88ae4adbf43c8 Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Thu, 18 Apr 2019 13:11:11 -0400
Subject: [PATCH] Update modifiers_misc.dm

---
 code/modules/mob/_modifiers/modifiers_misc.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/modules/mob/_modifiers/modifiers_misc.dm b/code/modules/mob/_modifiers/modifiers_misc.dm
index 42dd125d8b..64be119d7c 100644
--- a/code/modules/mob/_modifiers/modifiers_misc.dm
+++ b/code/modules/mob/_modifiers/modifiers_misc.dm
@@ -268,8 +268,6 @@ the artifact triggers the rage.
 	if(L.get_poison_protection() >= 1)
 		return FALSE
 	return TRUE
-<<<<<<< HEAD
-=======
 
 // Pulse modifier.
 /datum/modifier/false_pulse
@@ -281,4 +279,3 @@ the artifact triggers the rage.
 	stacks = MODIFIER_STACK_EXTEND
 
 	pulse_set_level = PULSE_NORM
->>>>>>> 3661d6f... Merge pull request #6081 from Mechoid/PulseBasedReagentProcessing