From 95227d0882184659bfe4e1322a3b9e246e145f0b Mon Sep 17 00:00:00 2001 From: Joakim Verona Date: Wed, 11 Sep 2013 08:44:18 +0200 Subject: [PATCH] fix conflicts --- lisp/ibuffer.el | 2 +- lisp/mail/rmail.el | 2 +- src/emacsgtkfixed.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el index 8356a186f13..cde6e2e3d43 100644 --- a/lisp/ibuffer.el +++ b/lisp/ibuffer.el @@ -2628,7 +2628,7 @@ will be inserted before the group at point." ;;; Start of automatically extracted autoloads. -;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "85795a4045d20654599b73b88e8e1bc9") +;;;### (autoloads nil "ibuf-ext" "ibuf-ext.el" "d06b2735a74954e0c6922a811de7608c") ;;; Generated autoloads from ibuf-ext.el (autoload 'ibuffer-auto-mode "ibuf-ext" "\ diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index aa244ddae81..bb4801a523d 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4768,7 +4768,7 @@ If prefix argument REVERSE is non-nil, sorts in reverse order. ;;;*** -;;;### (autoloads nil "rmailsum" "rmailsum.el" "a9b3bbd9b82dd566524a1209b5cdb7dd") +;;;### (autoloads nil "rmailsum" "rmailsum.el" "9005bd5da3e21d1cc173e86fd9fec3c9") ;;; Generated autoloads from rmailsum.el (autoload 'rmail-summary "rmailsum" "\ diff --git a/src/emacsgtkfixed.h b/src/emacsgtkfixed.h index c7468e39c7b..4cea0b23332 100644 --- a/src/emacsgtkfixed.h +++ b/src/emacsgtkfixed.h @@ -25,7 +25,6 @@ along with GNU Emacs. If not, see . */ G_BEGIN_DECLS -<<<<<<< HEAD struct frame; #define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) @@ -53,8 +52,6 @@ struct _EmacsFixedClass GtkFixedClass parent_class; }; -======= ->>>>>>> trunk extern GtkWidget *emacs_fixed_new (struct frame *f); extern GType emacs_fixed_get_type (void); -- 2.39.2