From f8970616297c76a59f069a01b5cc0d105ac672cf Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Sat, 8 Aug 2020 16:20:10 -0400
Subject: [PATCH] Merge r_draw.h

---
 src/r_draw.h | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/r_draw.h b/src/r_draw.h
index 86a11eaad..466430e9f 100644
--- a/src/r_draw.h
+++ b/src/r_draw.h
@@ -110,14 +110,9 @@ extern lumpnum_t viewborderlump[8];
 #define TC_BOSS       -2
 #define TC_METALSONIC -3 // For Metal Sonic battle
 #define TC_ALLWHITE   -4 // For Cy-Brak-demon
-<<<<<<< HEAD
-#define TC_RAINBOW    -5 // For invincibility power
-#define TC_BLINK      -6 // For item blinking
-=======
 #define TC_RAINBOW    -5 // For single colour
 #define TC_BLINK      -6 // For item blinking, according to kart
 #define TC_DASHMODE   -7 // For Metal Sonic's dashmode
->>>>>>> srb2/next
 
 // Initialize color translation tables, for player rendering etc.
 void R_InitTranslationTables(void);