mika/nx-hbmenu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trying to get rid of the weird merge conflict text

Browse Source
This commit is contained in:
NightlyFox 2018-09-29 06:44:01 -05:00
parent bf01ed1d39
commit 6105fe1ada
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/menu-list.c
View File

@ -209,16 +209,12 @@ int themeMenuScan(const char* target) {
menuEntry_s* me = menuCreateEntry(ENTRY_TYPE_THEME); menuEntry_s* me = menuCreateEntry(ENTRY_TYPE_THEME);
if(me) { 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 if(menuEntryLoad(me, "Default Theme", false))//Create Default theme Menu Entry
menuAddEntryToFront(me); menuAddEntryToFront(me);
else else
menuDeleteEntry(me); menuDeleteEntry(me);
>>>>>>> 5b35642de73c65ee63ae904288f1cbaea6a8e884
} }
// Swap the menu and clear the previous menu // Swap the menu and clear the previous menu
s_curMenu = !s_curMenu; s_curMenu = !s_curMenu;
menuClear(); menuClear();