From a66ec074d65ad83762f4ea4340ada2084b1ea4bc Mon Sep 17 00:00:00 2001
From: Novacat <35587478+Novacat@users.noreply.github.com>
Date: Tue, 30 Jun 2020 17:22:39 -0400
Subject: [PATCH] Update mecha.dm

---
 code/game/mecha/mecha.dm | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 5864adc65f9..1b00505bc9a 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -100,12 +100,8 @@
 	var/static/image/radial_image_lighttoggle = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_light")
 	var/static/image/radial_image_statpanel = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_examine2")
 
-<<<<<<< HEAD
-	var/datum/mini_hud/mech/minihud
-
-=======
+	var/datum/mini_hud/mech/minihud //VOREStation Edit
 	var/strafing = 0
->>>>>>> cdbf339... Add straffing to mechs. This took my entire morning goddamnit. (#7306)
 
 /obj/mecha/drain_power(var/drain_check)
 
@@ -2225,4 +2221,4 @@
 			if(-INFINITY to 15)
 				occupant.throw_alert("mech damage", /obj/screen/alert/low_mech_integrity, 3)
 			else
-				occupant.clear_alert("mech damage")
\ No newline at end of file
+				occupant.clear_alert("mech damage")