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] 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;