From 3a14fc724c5a0092a9308f86b499e8b894eff260 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.noreply.github.com>
Date: Mon, 18 Mar 2019 00:14:12 -0400
Subject: [PATCH] fix merge conflict

---
 src/fceu.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/fceu.cpp b/src/fceu.cpp
index 2b5cee6f..d45e6151 100644
--- a/src/fceu.cpp
+++ b/src/fceu.cpp
@@ -404,7 +404,7 @@ int FDSLoad(const char *name, FCEUFILE *fp);
 int NSFLoad(const char *name, FCEUFILE *fp);
 
 //char lastLoadedGameName [2048] = {0,}; // hack for movie WRAM clearing on record from poweron
-bool archiveManuallyCanceled;
+extern bool archiveManuallyCanceled;
 
 //name should be UTF-8, hopefully, or else there may be trouble
 FCEUGI *FCEUI_LoadGameVirtual(const char *name, int OverwriteVidMode, bool silent)