From fd4666b481235360f6fa697c030ef56665ec398e Mon Sep 17 00:00:00 2001
From: SwitchKaze <azeonus@gmail.com>
Date: Sat, 29 Feb 2020 23:44:56 -0500
Subject: [PATCH] Bruh.

---
 src/hu_stuff.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 9bca60208..e3034c09c 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -759,7 +759,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
 		}
 		else
         {
-<<<<<<< HEAD
 			UINT16 chatcolor = skincolors[players[playernum].skincolor].chatcolor;
 
 			if (!chatcolor || chatcolor%0x1000 || chatcolor>V_INVERTMAP)