From 3b34b3230cd5d9dd6cab2c4ee5e9070fd0650303 Mon Sep 17 00:00:00 2001
From: Sally Coolatta <tehrealsalt@gmail.com>
Date: Mon, 10 Aug 2020 12:01:11 -0400
Subject: [PATCH] Bruh

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

diff --git a/src/d_main.c b/src/d_main.c
index bf1ff98b7..6862b528d 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -855,11 +855,7 @@ void D_SRB2Loop(void)
 	*/
 	/* Smells like a hack... Don't fade Sonic's ass into the title screen. */
 	if (gamestate != GS_TITLESCREEN)
-<<<<<<< HEAD
 		V_DrawFixedPatch(0, 0, FRACUNIT/2, 0, (patch_t *)W_CacheLumpNum(W_GetNumForName("KARTKREW"), PU_CACHE), NULL);
-=======
-		V_DrawScaledPatch(0, 0, 0, W_CachePatchNum(W_GetNumForName("CONSBACK"), PU_PATCH));
->>>>>>> srb2/next
 
 	for (;;)
 	{