From ff3b69cec76b4f143f77a8391a8dcfcbf6cf7715 Mon Sep 17 00:00:00 2001
From: thrust26 <tjentzsch@yahoo.de>
Date: Fri, 21 Feb 2020 12:44:06 +0100
Subject: [PATCH] One more for Merge remote-tracking branch
 'remotes/origin/master' into feature-highscores

---
 src/gui/LauncherDialog.cxx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/gui/LauncherDialog.cxx b/src/gui/LauncherDialog.cxx
index da341f081..513718c8f 100644
--- a/src/gui/LauncherDialog.cxx
+++ b/src/gui/LauncherDialog.cxx
@@ -208,10 +208,6 @@ LauncherDialog::LauncherDialog(OSystem& osystem, DialogContainer& parent,
 
   // Create (empty) context menu for ROM list options
   myMenu = make_unique<ContextMenu>(this, osystem.frameBuffer().font(), EmptyVarList);
-<<<<<<< HEAD
-=======
-
->>>>>>> remotes/origin/master
 
   // Create global props dialog, which is used to temporarily overrride
   // ROM properties