From bf884fc6c5ebf15cee6f10f89c168fbf5731af24 Mon Sep 17 00:00:00 2001
From: lachwright <lachlanwright17@gmail.com>
Date: Mon, 10 Aug 2020 11:54:55 +0800
Subject: [PATCH] dehacked.c

---
 src/dehacked.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/dehacked.c b/src/dehacked.c
index 708c69a78..ff8545d98 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -4338,18 +4338,15 @@ static void readmaincfg(MYFILE *f)
 				titlescrollyspeed = get_number(word2);
 				titlechanged = true;
 			}
-<<<<<<< HEAD
 			else if (fastcmp(word, "CREDITSCUTSCENE"))
 			{
 				creditscutscene = (UINT8)get_number(word2);
 				// range check, you morons.
 				if (creditscutscene > 128)
 					creditscutscene = 128;
-=======
 			else if (fastcmp(word, "DISABLESPEEDADJUST"))
 			{
 				disableSpeedAdjust = (value || word2[0] == 'T' || word2[0] == 'Y');
->>>>>>> srb2/next
 			}
 			else if (fastcmp(word, "NUMDEMOS"))
 			{