From f8882fe8f92af456ebd629038d931276bdb0a1ff Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 22:50:38 +0100
Subject: [PATCH] Fix mismerge

---
 normal/menu.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/normal/menu.c b/normal/menu.c
index 850350edd..17730eff3 100644
--- 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)
 {