From adee6c3910b509f02197cd23b5f696f335bd4143 Mon Sep 17 00:00:00 2001
From: Jaime Passos <lazymyuutsu@gmail.com>
Date: Wed, 19 Feb 2020 00:56:14 -0300
Subject: [PATCH] I forgot to save :]

---
 src/d_main.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/d_main.c b/src/d_main.c
index bec5a3e2d..418da4ecc 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -1292,10 +1292,7 @@ void D_SRB2Main(void)
 		needpatchrecache = true;
 		VID_CheckRenderer();
 		SCR_ChangeRendererCVars(setrenderneeded);
-<<<<<<< HEAD
-=======
 		D_CheckRendererState();
->>>>>>> origin/master
 		setrenderneeded = 0;
 	}