From 10eaeed06b7060d6bda2b50db739f196bb1c8b6e Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Mon, 18 Dec 2017 17:25:09 -0600
Subject: [PATCH] Update carbon.dm

---
 code/modules/mob/living/carbon/carbon.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 4b2a6f64d5..23decdd59f 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -157,11 +157,8 @@
 			if(!throwable_mob.buckled)
 				thrown_thing = throwable_mob
 				stop_pulling()
-<<<<<<< HEAD
-=======
 				if(has_disability(PACIFISM))
 					to_chat(src, "<span class='notice'>You gently let go of [throwable_mob].</span>")
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 				var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
 				var/turf/end_T = get_turf(target)
 				if(start_T && end_T)
@@ -173,13 +170,10 @@
 		thrown_thing = I
 		dropItemToGround(I)
 
-<<<<<<< HEAD
-=======
 		if(has_disability(PACIFISM) && I.throwforce)
 			to_chat(src, "<span class='notice'>You set [I] down gently on the ground.</span>")
 			return
 
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 	if(thrown_thing)
 		visible_message("<span class='danger'>[src] has thrown [thrown_thing].</span>")
 		add_logs(src, thrown_thing, "has thrown")