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