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

splhack · web-flow · commit 2cc13f87937b · 2018-03-06T17:33:58.000-08:00
Remove conflicts artefacts left after merging
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -8760,13 +8760,9 @@ ex_tearoff(exarg_T *eap)`
`8760`	`8760`	`}`
`8761`	`8761`	`#endif`
`8762`	`8762`
`8763`		`-<<<<<<< HEAD`
`8764`		`-#if defined(FEAT_MENU) && (defined(FEAT_GUI_MSWIN) \|\| defined(FEAT_GUI_GTK) \`
`8765`		`- \|\| defined(FEAT_GUI_MACVIM))`
`8766`		`-=======`
`8767`	`8763`	`#if (defined(FEAT_GUI_MSWIN) \|\| defined(FEAT_GUI_GTK) \`
	`8764`	`+ \|\| defined(FEAT_GUI_MACVIM) \`
`8768`	`8765`	`\|\| defined(FEAT_TERM_POPUP_MENU)) && defined(FEAT_MENU)`
`8769`		`->>>>>>> vim/master`
`8770`	`8766`	`static void`
`8771`	`8767`	`ex_popup(exarg_T *eap)`
`8772`	`8768`	`{`