From 6105fe1ada7f2e7562eed9c101c4d060ad11ec37 Mon Sep 17 00:00:00 2001
From: NightlyFox <nightlyfox94@gmail.com>
Date: Sat, 29 Sep 2018 06:44:01 -0500
Subject: [PATCH] trying to get rid of the weird merge conflict text

---
 common/menu-list.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/common/menu-list.c b/common/menu-list.c
index 991fd34..5e26aa2 100644
--- a/common/menu-list.c
+++ b/common/menu-list.c
@@ -209,16 +209,12 @@ int themeMenuScan(const char* target) {
     menuEntry_s* me = menuCreateEntry(ENTRY_TYPE_THEME);
 
     if(me) {
-<<<<<<< HEAD
-        if(menuEntryLoad(me, "Default Theme", false));//Create Default theme Menu Entry
-            menuAddEntryToFront(me);
-=======
         if(menuEntryLoad(me, "Default Theme", false))//Create Default theme Menu Entry
             menuAddEntryToFront(me);
         else
             menuDeleteEntry(me);
->>>>>>> 5b35642de73c65ee63ae904288f1cbaea6a8e884
     }
+
     // Swap the menu and clear the previous menu
     s_curMenu = !s_curMenu;
     menuClear();