Fix mismerge

This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-12-29 22:50:38 +01:00
parent 7a68c375f3
commit f8882fe8f9

View file

@ -232,9 +232,6 @@ menu_fini (void)
viewers = NULL; viewers = NULL;
} }
/* FIXME: allow text menu in parallel with gfxmenu. */
grub_err_t (*grub_gfxmenu_try_hook) (int entry, grub_menu_t menu,
int nested) = NULL;
static void static void
menu_init (int entry, grub_menu_t menu, int nested) menu_init (int entry, grub_menu_t menu, int nested)
{ {