From 709d55bc4a6080c67450115cde476c75be12721a Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Sat, 23 Dec 2017 13:50:48 -0600
Subject: [PATCH] Update pneumaticCannon.dm

---
 code/game/objects/items/pneumaticCannon.dm | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 2b3f8f42a0..dc0a2fe286 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -147,16 +147,10 @@
 	if(tank && !tank.air_contents.remove(gasPerThrow * pressureSetting))
 		to_chat(user, "<span class='warning'>\The [src] lets out a weak hiss and doesn't react!</span>")
 		return
-<<<<<<< HEAD
-	if(user.disabilities & CLUMSY && prob(75) && clumsyCheck)
-		user.visible_message("<span class='warning'>[user] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
-		user.dropItemToGround(src, TRUE)
-=======
 	if(user.has_disability(CLUMSY) && prob(75) && clumsyCheck && iscarbon(user))
 		var/mob/living/carbon/C = user
 		C.visible_message("<span class='warning'>[C] loses their grip on [src], causing it to go off!</span>", "<span class='userdanger'>[src] slips out of your hands and goes off!</span>")
 		C.dropItemToGround(src, TRUE)
->>>>>>> 6ce550d... Clownborgs (#33590)
 		if(prob(10))
 			target = get_turf(user)
 		else