mirror of
https://git.savannah.gnu.org/git/grub.git
synced 2026-10-26 17:19:22 +00:00
Fix mismerge
This commit is contained in:
1 parent
7a68c375f3
commit
f8882fe8f9
1 file changed
-3
@@ -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)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user