Merge branch 'master' of github.com:fr500/RetroArch

Conflicts: frontend/menu/menu_common.c
2014-03-03 18:45:06 -05:00 · 2014-03-03 18:45:06 -05:00 · 511f158255
parent a863dcdeae 14381bd033
commit 511f158255
1 changed files with 0 additions and 1 deletions
--- a/frontend/menu/menu_common.c
+++ b/frontend/menu/menu_common.c
@ -1926,7 +1926,6 @@ void menu_populate_entries(void *data, unsigned menu_type)
            file_list_push(rgui->selection_buf, "No options available.", RGUI_SETTINGS_CORE_OPTION_NONE, 0);
         break;		 
      case RGUI_SETTINGS_CORE_INFO:
-<<<<<<< HEAD
         file_list_clear(rgui->selection_buf);
         if (rgui->core_info_current.data)
         {