From 507c862c7cb801b0925903753d7c7097aa0ae125 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Tue, 28 Nov 2017 22:24:00 -0500
Subject: [PATCH] Update hud.dm

---
 code/modules/clothing/glasses/hud.dm | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index 93e2fa5254..762f1e53b0 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -62,12 +62,8 @@
 	name = "diagnostic HUD"
 	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits."
 	icon_state = "diagnostichud"
-<<<<<<< HEAD
 	origin_tech = "magnets=2;engineering=2"
-	hud_type = DATA_HUD_DIAGNOSTIC
-=======
 	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
->>>>>>> 069f909... Added bot path data huds (#32967)
 	glass_colour_type = /datum/client_colour/glass_colour/lightorange
 
 /obj/item/clothing/glasses/hud/diagnostic/night