From 1983e62c1be967a0c26738794bc4fe8120be8eb5 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Fri, 16 Feb 2018 07:54:03 -0600
Subject: [PATCH] Update durand.dm

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

diff --git a/code/game/mecha/combat/durand.dm b/code/game/mecha/combat/durand.dm
index ceaea0e9d9..caaa3e3a00 100644
--- a/code/game/mecha/combat/durand.dm
+++ b/code/game/mecha/combat/durand.dm
@@ -1,27 +1,3 @@
-<<<<<<< HEAD
-/obj/mecha/combat/durand
-	desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
-	name = "\improper Durand"
-	icon_state = "durand"
-	step_in = 4
-	dir_in = 1 //Facing North.
-	max_integrity = 400
-	deflect_chance = 20
-	armor = list(melee = 40, bullet = 35, laser = 15, energy = 10, bomb = 20, bio = 0, rad = 0, fire = 100, acid = 100)
-	max_temperature = 30000
-	infra_luminosity = 8
-	force = 40
-	wreckage = /obj/structure/mecha_wreckage/durand
-
-/obj/mecha/combat/durand/GrantActions(mob/living/user, human_occupant = 0)
-	..()
-	defense_action.Grant(user, src)
-
-/obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
-	..()
-	defense_action.Remove(user)
-
-=======
 /obj/mecha/combat/durand
 	desc = "An aging combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."
 	name = "\improper Durand"
@@ -43,5 +19,3 @@
 /obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
 	..()
 	defense_action.Remove(user)
-
->>>>>>> d282c60... Quote the armor lists (#35668)