averello/macvim-mirror
1
0
Fork 0
mirror of https://github.com/macvim-dev/macvim.git synced 2026-06-11 15:37:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #644 from prmtl/fix/merging-artifacts

Browse Source 
Remove conflicts artefacts left after merging
This commit is contained in:
Kazuki Sakamoto
2018-03-06 17:33:58 -08:00
committed by GitHub
parent 0248eca892 b5dae385de
commit 2cc13f8793
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ex_docmd.c
+1 -5
View File
@@ -8760,13 +8760,9 @@ ex_tearoff(exarg_T *eap)
}
#endif
<<<<<<< HEAD
#if defined(FEAT_MENU) && (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \
|| defined(FEAT_GUI_MACVIM))
=======
#if (defined(FEAT_GUI_MSWIN) || defined(FEAT_GUI_GTK) \
|| defined(FEAT_GUI_MACVIM) \
|| defined(FEAT_TERM_POPUP_MENU)) && defined(FEAT_MENU)
>>>>>>> vim/master
static void
ex_popup(exarg_T *eap)
{