From fd000248b76766c5a8ce527bc6c89d193855c1de Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Mon, 10 Aug 2020 13:03:41 -0400
Subject: [PATCH] Merge sdl/i_video.c

---
 src/sdl/i_video.c | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/sdl/i_video.c b/src/sdl/i_video.c
index 196f276fa..2c16f23e4 100644
--- a/src/sdl/i_video.c
+++ b/src/sdl/i_video.c
@@ -360,10 +360,6 @@ static INT32 Impl_SDL_Scancode_To_Keycode(SDL_Scancode code)
 		case SDL_SCANCODE_RGUI:   return KEY_RIGHTWIN;
 		default:                  break;
 	}
-<<<<<<< HEAD
-=======
-
->>>>>>> srb2/next
 	return 0;
 }
 
@@ -1422,7 +1418,6 @@ void I_FinishUpdate(void)
 	if (I_SkipFrame())
 		return;
 
-<<<<<<< HEAD
 	if (st_overlay)
 	{
 		if (cv_ticrate.value)
@@ -1434,10 +1429,9 @@ void I_FinishUpdate(void)
 			SCR_DisplayLocalPing();
 		}
 	}
-=======
+
 	if (marathonmode)
 		SCR_DisplayMarathonInfo();
->>>>>>> srb2/next
 
 	// draw captions if enabled
 	if (cv_closedcaptioning.value)