Fix mismerge
This commit is contained in:
parent
7a68c375f3
commit
f8882fe8f9
1 changed files with 0 additions and 3 deletions
|
@ -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)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue