fix conflicts

src/emacsgtkfixed.c

@@ -23,9 +23,12 @@ 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.  */

src/emacsgtkfixed.h

@@ -25,6 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 G_BEGIN_DECLS
 
+<<<<<<< HEAD
 struct frame;
 
 #define EMACS_TYPE_FIXED                  (emacs_fixed_get_type ())
@@ -52,6 +53,8 @@ struct _EmacsFixedClass
   GtkFixedClass parent_class;
 };
 
+=======
+>>>>>>> trunk
 extern GtkWidget *emacs_fixed_new (struct frame *f);
 extern GType emacs_fixed_get_type (void);
 

src/window.c

@@ -45,12 +45,15 @@ 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;

src/xdisp.c

@@ -303,10 +303,13 @@ 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