From 0fed8c2ee3b9e437cda091df1b685e6087996f21 Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Mon, 10 Aug 2020 15:27:58 -0400
Subject: [PATCH 1/5] Merge sdl/hwsym_sdl.c

---
 src/sdl/hwsym_sdl.c | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/sdl/hwsym_sdl.c b/src/sdl/hwsym_sdl.c
index c2498609b..416c8d2f5 100644
--- a/src/sdl/hwsym_sdl.c
+++ b/src/sdl/hwsym_sdl.c
@@ -104,29 +104,15 @@ void *hwSym(const char *funcName,void *handle)
 	GETFUNC(MakeScreenFinalTexture);
 	GETFUNC(DrawScreenFinalTexture);
 
-<<<<<<< HEAD
-	GETFUNC(RenderSkyDome);
-
-=======
->>>>>>> srb2/next
 	GETFUNC(LoadShaders);
 	GETFUNC(KillShaders);
 	GETFUNC(SetShader);
 	GETFUNC(UnSetShader);
 
-<<<<<<< HEAD
-	GETFUNC(LoadCustomShader);
-	GETFUNC(InitCustomShaders);
-
-	GETFUNC(StartBatching);
-	GETFUNC(RenderBatches);
-
-=======
 	GETFUNC(SetShaderInfo);
 	GETFUNC(LoadCustomShader);
 	GETFUNC(InitCustomShaders);
 
->>>>>>> srb2/next
 #else //HWRENDER
 	if (0 == strcmp("FinishUpdate", funcName))
 		return funcPointer; //&FinishUpdate;

From 7d51db242d7fdba2ecb8eb61daaa027c037e0bf8 Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Mon, 10 Aug 2020 15:33:36 -0400
Subject: [PATCH 2/5] Merge hardware/hw_light.c

---
 src/hardware/hw_light.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 779b2ff24..5c5df0e94 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -1,25 +1,15 @@
 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
-<<<<<<< HEAD
-// Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2019 by Sonic Team Junior.
-=======
 // Copyright (C) 1998-2000 by DooM Legacy Team.
 // Copyright (C) 1999-2020 by Sonic Team Junior.
->>>>>>> srb2/next
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
 // See the 'LICENSE' file for more details.
 //-----------------------------------------------------------------------------
-<<<<<<< HEAD
-/// \file
-=======
 /// \file hw_light.c
 /// \brief Corona/Dynamic/Static lighting add on by Hurdler
-///	!!! Under construction !!!
->>>>>>> srb2/next
+///	!!! Under construction !!!\
 
 #include "../doomdef.h"
 
@@ -35,8 +25,6 @@
 #include "../r_main.h"
 #include "../p_local.h"
 
-<<<<<<< HEAD
-=======
 //=============================================================================
 //                                                                      DEFINES
 //=============================================================================

From a93282d89314ffc405f913dfb1051ebcc17a8d7c Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Mon, 10 Aug 2020 15:34:59 -0400
Subject: [PATCH 3/5] Forgot hw_light.h

---
 src/hardware/hw_light.h | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/hardware/hw_light.h b/src/hardware/hw_light.h
index b8de2e507..a652a2a3c 100644
--- a/src/hardware/hw_light.h
+++ b/src/hardware/hw_light.h
@@ -1,13 +1,7 @@
 // SONIC ROBO BLAST 2
 //-----------------------------------------------------------------------------
-<<<<<<< HEAD
-// Copyright (C) 1993-1996 by id Software, Inc.
-// Copyright (C) 1998-2000 by DooM Legacy Team.
-// Copyright (C) 1999-2019 by Sonic Team Junior.
-=======
 // Copyright (C) 1998-2000 by DooM Legacy Team.
 // Copyright (C) 1999-2020 by Sonic Team Junior.
->>>>>>> srb2/next
 //
 // This program is free software distributed under the
 // terms of the GNU General Public License, version 2.
@@ -22,8 +16,6 @@
 #include "hw_glob.h"
 #include "hw_defs.h"
 
-<<<<<<< HEAD
-=======
 #define NUMLIGHTFREESLOTS 32 // Free light slots (for SOCs)
 
 #ifdef ALAM_LIGHTING

From 7ad5057fe93d6c21033490e769a5026615e10af8 Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Mon, 10 Aug 2020 15:41:39 -0400
Subject: [PATCH 4/5] Merge win32/win_vid.c

---
 src/win32/win_vid.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/win32/win_vid.c b/src/win32/win_vid.c
index 0d0fd57fc..6bf9eab9e 100644
--- a/src/win32/win_vid.c
+++ b/src/win32/win_vid.c
@@ -300,11 +300,6 @@ static inline boolean I_SkipFrame(void)
 				return false;
 		/* FALLTHRU */
 		//case GS_TIMEATTACK: -- sorry optimisation but now we have a cool level platter and that being laggardly looks terrible
-<<<<<<< HEAD
-=======
-#ifndef NONET
->>>>>>> srb2/next
-		/* FALLTHRU */
 		case GS_WAITINGPLAYERS:
 			return skip; // Skip odd frames
 		default:

From 5271db81b786172adfdbe4156037cf28c663417e Mon Sep 17 00:00:00 2001
From: SteelT <steeltitanium1@gmail.com>
Date: Mon, 10 Aug 2020 15:41:49 -0400
Subject: [PATCH 5/5] Merge win32/win_dll.c

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

diff --git a/src/win32/win_dll.c b/src/win32/win_dll.c
index 2f50a63e4..f492cd92d 100644
--- a/src/win32/win_dll.c
+++ b/src/win32/win_dll.c
@@ -86,9 +86,6 @@ static VOID UnloadDLL (HMODULE* pModule)
 // ==========================================================================
 
 // note : the 3D driver loading should be put somewhere else..
-<<<<<<< HEAD
-=======
-
 #ifdef HWRENDER
 static HMODULE hwdModule = NULL;
 
@@ -173,7 +170,6 @@ VOID Shutdown3DDriver (VOID)
 }
 #endif
 
->>>>>>> srb2/next
 #ifdef HW3SOUND
 static HMODULE hwsModule = NULL;