From 2d02ae00773a47372eefdabc1a591c30ae05d796 Mon Sep 17 00:00:00 2001
From: kevinz000 <2003111+kevinz000@users.noreply.github.com>
Date: Tue, 3 Mar 2020 21:06:29 -0700
Subject: [PATCH] oops

---
 code/datums/martial/rising_bass.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/datums/martial/rising_bass.dm b/code/datums/martial/rising_bass.dm
index 60fab7cf66..22605e5624 100644
--- a/code/datums/martial/rising_bass.dm
+++ b/code/datums/martial/rising_bass.dm
@@ -115,11 +115,7 @@
 	return basic_hit(A,D)
 
 /datum/martial_art/the_rising_bass/proc/repulsePunch(mob/living/carbon/human/A, mob/living/carbon/human/D)
-<<<<<<< HEAD
 	if(CHECK_MOBILITY(D, MOBILITY_STAND) && repulsecool < world.time)
-=======
-	if((!D.IsKnockdown() || !D.lying) && repulsecool > world.time)
->>>>>>> citadel/master
 		A.do_attack_animation(D, ATTACK_EFFECT_PUNCH)
 		D.visible_message("<span class='warning'>[A] smashes [D] in the chest, throwing them away!</span>", \
 						  "<span class='userdanger'>[A] smashes you in the chest, repelling you away!</span>")