From: Joakim Verona <joakim@verona.se>
Date: Wed, 11 Sep 2013 05:59:34 +0000 (+0200)
Subject: fix conflicts
X-Git-Tag: emacs-25.0.90~2695
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a41d9dcfc950458c081f832606dac2081d14c8ae;p=emacs.git

fix conflicts
---

diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 8de2db4dca5..1e57eeb57c4 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -23,12 +23,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "lisp.h"
 #include "frame.h"
 #include "xterm.h"
-<<<<<<< HEAD
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-=======
->>>>>>> trunk
 #include "emacsgtkfixed.h"
 
 /* Silence a bogus diagnostic; see GNOME bug 683906.  */
diff --git a/src/window.c b/src/window.c
index 5c4527f4671..410015e472e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -45,15 +45,12 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifdef MSDOS
 #include "msdos.h"
 #endif
-<<<<<<< HEAD
 #ifdef HAVE_NS
 #include "nsterm.h"
 #endif
 #ifdef HAVE_XWIDGETS
 #include "xwidget.h"
 #endif
-=======
->>>>>>> trunk
 
 Lisp_Object Qwindowp, Qwindow_live_p;
 static Lisp_Object Qwindow_valid_p;