From 64f003d3b1b304a85ee297be34040cc36d60ed19 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 18 Dec 2017 17:26:25 -0600
Subject: [PATCH] Update living.dm

---
 code/modules/mob/living/living.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 24985f54a6..bd6b00dea7 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -811,12 +811,9 @@
 	if (G.trigger_guard != TRIGGER_GUARD_ALLOW_ALL && !IsAdvancedToolUser())
 		to_chat(src, "<span class='warning'>You don't have the dexterity to do this!</span>")
 		return FALSE
-<<<<<<< HEAD
-=======
 	if(has_disability(PACIFISM))
 		to_chat(src, "<span class='notice'>You don't want to risk harming anyone!</span>")
 		return FALSE
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 	return TRUE
 
 /mob/living/carbon/proc/update_stamina()
@@ -1059,4 +1056,4 @@
 
 /mob/living/onTransitZ(old_z,new_z)
 	..()
-	update_z(new_z)
\ No newline at end of file
+	update_z(new_z)