From 960696e2723adc09494aed07472f86be8a89f49e Mon Sep 17 00:00:00 2001
From: Kazuki Sakamoto <sakamoto@splhack.org>
Date: Tue, 19 Jan 2016 12:27:12 -0800
Subject: [PATCH] Fix merge

---
 src/proto/menu.pro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/proto/menu.pro b/src/proto/menu.pro
index c7d0e636ff..f5359e1d22 100644
--- a/src/proto/menu.pro
+++ b/src/proto/menu.pro
@@ -22,6 +22,6 @@ void ex_menutranslate(exarg_T *eap);
 #ifdef FEAT_GUI_MACVIM
 void ex_macmenu(exarg_T *eap);
 void ex_macmenukey(exarg_T *eap);
-char_u *lookup_toolbar_item((int idx);
+char_u *lookup_toolbar_item(int idx);
 #endif
 /* vim: set ft=c : */