Fix merge

This commit is contained in:
Kazuki Sakamoto
2016-01-19 12:27:12 -08:00
parent 692938007d
commit 960696e272
+1 -1
View File
@@ -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 : */