From b5dae385de09612064e904bd0078f3ebec91f024 Mon Sep 17 00:00:00 2001
From: Sebastian Kalinowski <sebastian@kalinowski.eu>
Date: Tue, 6 Mar 2018 09:47:50 +0100
Subject: [PATCH] Remove conflicts artifacts left after merging

Fixes: #643
---
 src/ex_docmd.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ex_docmd.c b/src/ex_docmd.c
index a31a892a28..45bd24cbf3 100644
--- 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)
 {