From 550ecafd155973c7c2ea5158159228d6331e921e Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Tue, 28 Mar 2017 19:26:55 +0100
Subject: [PATCH] Merge error fix

---
 src/f_finale.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/f_finale.c b/src/f_finale.c
index c3a0df5f6..dd5defd57 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1002,7 +1002,7 @@ static const char *credits[] = {
 	"",
 	"\1Sprite Artists",
 	"Odi \"Iceman404\" Atunzu",
-	"Victor \"VAdaPEGA\" Ara\x1Fjo", // Arajo -- sorry for our limited font! D:
+	"Victor \"VAdaPEGA\" Ara\x1Fjo", // Araújo -- sorry for our limited font! D:
 	"Jim \"MotorRoach\" DeMello",
 	"Desmond \"Blade\" DesJardins",
 	"Sherman \"CoatRack\" DesJardins",
@@ -1427,7 +1427,6 @@ void F_StartTitleScreen(void)
 
 	if (titlemap)
 	{
-		titlemapinaction = true;
 		titlemapinaction = true;
 		gamemap = titlemap;