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

---
 code/__DEFINES/role_preferences.dm | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm
index f68f8881ac..cea6bc5e36 100644
--- a/code/__DEFINES/role_preferences.dm
+++ b/code/__DEFINES/role_preferences.dm
@@ -22,11 +22,8 @@
 #define ROLE_REVENANT			"revenant"
 #define ROLE_DEVIL				"devil"
 #define ROLE_SERVANT_OF_RATVAR	"servant of Ratvar"
-<<<<<<< HEAD
 #define ROLE_BORER				"borer"
-=======
 #define ROLE_BROTHER			"blood brother"
->>>>>>> 1e4d1ca... Traitorbro gamemode (#30344)
 
 //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR.
 //The gamemode specific ones are just so the gamemodes can query whether a player is old enough