Update item_attack.dm

2017-12-18 17:24:02 -06:00
parent 9ccdb75e57
commit 6c50ca9157
1 changed files with 0 additions and 3 deletions
@@ -58,11 +58,8 @@
 	SendSignal(COMSIG_ITEM_ATTACK, M, user)
 	if(flags_1 & NOBLUDGEON_1)
 		return
-<<<<<<< HEAD
-=======
 	if(user.has_disability(PACIFISM))
 		return
->>>>>>> 146d167... [Ready Again]Refactors disabilities into lists, allowing for independent disability sources (#33055)
 	if(!force)
 		playsound(loc, 'sound/weapons/tap.ogg', get_clamped_volume(), 1, -1)
 	else if(hitsound)