From 46b1dc2856fcfd6222f5320a511fcf0863c9c04c Mon Sep 17 00:00:00 2001
From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 07:47:21 +0200
Subject: [PATCH] fix conflicts

---
 src/xdisp.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/xdisp.c b/src/xdisp.c
index 0e3d398035a..b9a16ffcc43 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -303,13 +303,10 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include TERM_HEADER
 #endif /* HAVE_WINDOW_SYSTEM */
 
-<<<<<<< HEAD
 #include "font.h"
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-=======
->>>>>>> trunk
 #ifndef FRAME_X_OUTPUT
 #define FRAME_X_OUTPUT(f) ((f)->output_data.x)
 #endif
-- 
2.39.2