Fix mismerge

diff --git a/normal/menu.c b/normal/menu.c
index 850350edda9b9dbf44e5e786cc231c1635497b42..17730eff3e447023abba60337041c3ee123506a5 100644 (file)
--- a/normal/menu.c
+++ b/normal/menu.c
@@ -232,9 +232,6 @@ menu_fini (void)
   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
 menu_init (int entry, grub_menu_t menu, int nested)
 {