From a4310ec6a603e6961f50e83120ac19059256e5a0 Mon Sep 17 00:00:00 2001
From: Poojawa <Poojawa@users.noreply.github.com>
Date: Sun, 17 Sep 2017 22:37:44 -0500
Subject: [PATCH] Update atom_hud.dm

---
 code/__DEFINES/atom_hud.dm | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm
index abb49552c2..d4b2dfb2db 100644
--- a/code/__DEFINES/atom_hud.dm
+++ b/code/__DEFINES/atom_hud.dm
@@ -40,11 +40,8 @@
 #define ANTAG_HUD_SINTOUCHED	16
 #define ANTAG_HUD_SOULLESS		17
 #define ANTAG_HUD_CLOCKWORK		18
-<<<<<<< HEAD
 #define ANTAG_HUD_BORER			19
-=======
-#define ANTAG_HUD_BROTHER		19
->>>>>>> 1e4d1ca... Traitorbro gamemode (#30344)
+#define ANTAG_HUD_BROTHER		20
 
 // Notification action types
 #define NOTIFY_JUMP "jump"