From a9e3deb51a453308838daa881da02a5ca8a8b776 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawa@users.noreply.github.com>
Date: Sun, 17 Sep 2017 22:38:31 -0500
Subject: [PATCH] Update hud.dm

---
 code/datums/hud.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/datums/hud.dm b/code/datums/hud.dm
index aba5ba6c57..60a53967ae 100644
--- a/code/datums/hud.dm
+++ b/code/datums/hud.dm
@@ -20,11 +20,8 @@ GLOBAL_LIST_INIT(huds, list(
 	ANTAG_HUD_SINTOUCHED = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_SOULLESS = new/datum/atom_hud/antag/hidden(),
 	ANTAG_HUD_CLOCKWORK = new/datum/atom_hud/antag(),
-<<<<<<< HEAD
 	ANTAG_HUD_BORER = new/datum/atom_hud/antag(),
-=======
 	ANTAG_HUD_BROTHER = new/datum/atom_hud/antag/hidden(),
->>>>>>> 1e4d1ca... Traitorbro gamemode (#30344)
 	))
 
 /datum/atom_hud