From 6f8c2c1daf6cfd76ad1cd9309e385295c275cdc2 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 29 Dec 2017 18:40:58 -0600
Subject: [PATCH] Update item_attack.dm

---
 code/_onclick/item_attack.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm
index f9c3c9668d..8a5b9ba519 100644
--- a/code/_onclick/item_attack.dm
+++ b/code/_onclick/item_attack.dm
@@ -58,13 +58,9 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
-<<<<<<< HEAD
-	if(user.disabilities & PACIFISM)
-=======
 
 	if(force && user.has_disability(DISABILITY_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm other living beings!</span>")
->>>>>>> 5d761c5... [Ready]Adds the Pax reagent, small tweaks to pacifism (#33663)
 		return
     
 	if(!force)