From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 29 Dec 2009 21:50:38 +0000 (+0100)
Subject: Fix mismerge
X-Git-Tag: 1.98~93^2~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8882fe8f92af456ebd629038d931276bdb0a1ff;p=thirdparty%2Fgrub.git

Fix mismerge
---

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)
 {