From 7ef71b67550cf92e6aaa0b98e5599ecacdb74049 Mon Sep 17 00:00:00 2001
From: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date: Sun, 5 Feb 2023 07:04:19 +1000
Subject: [PATCH] Update phazon.dm

---
 code/game/mecha/combat/phazon.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index f0da7245c92..04e3869cc1c 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -133,13 +133,8 @@
 
 	..()
 
-<<<<<<< HEAD
 /obj/mecha/combat/phazon/janus/dynattackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(prob(max(1, (50 - round((W.force / 2) * damage_absorption["brute"])) * (1 - (W.armor_penetration / 100)))))
-=======
-/obj/mecha/combat/phazon/janus/dynattackby(obj/item/W as obj, mob/user as mob)
 	if(prob(max(1, (50 - round((W.force / 2) * inherent_damage_absorption["brute"])) * (1 - (W.armor_penetration / 100)))))
->>>>>>> d29c9fe35a8... Merge pull request #8905 from MistakeNot4892/mechabad
 		src.occupant_message("<span class='alien'>The armor absorbs the incoming attack's force, negating it!</span>")
 		src.visible_message("<span class='alien'>The [src.name] absorbs the incoming attack's force, negating it!</span>")
 		src.log_append_to_last("Armor absorbed.")