diff options
| author | Joakim Verona | 2013-09-11 08:44:18 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-11 08:44:18 +0200 |
| commit | 95227d0882184659bfe4e1322a3b9e246e145f0b (patch) | |
| tree | 8bb01cc3621db8ef44658bf197c9ae37c5cd8c00 /src | |
| parent | a41d9dcfc950458c081f832606dac2081d14c8ae (diff) | |
| download | emacs-95227d0882184659bfe4e1322a3b9e246e145f0b.tar.gz emacs-95227d0882184659bfe4e1322a3b9e246e145f0b.zip | |
fix conflicts
Diffstat (limited to 'src')
| -rw-r--r-- | src/emacsgtkfixed.h | 3 |
1 files changed, 0 insertions, 3 deletions
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 <http://www.gnu.org/licenses/>. */ | |||
| 25 | 25 | ||
| 26 | G_BEGIN_DECLS | 26 | G_BEGIN_DECLS |
| 27 | 27 | ||
| 28 | <<<<<<< HEAD | ||
| 29 | struct frame; | 28 | struct frame; |
| 30 | 29 | ||
| 31 | #define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) | 30 | #define EMACS_TYPE_FIXED (emacs_fixed_get_type ()) |
| @@ -53,8 +52,6 @@ struct _EmacsFixedClass | |||
| 53 | GtkFixedClass parent_class; | 52 | GtkFixedClass parent_class; |
| 54 | }; | 53 | }; |
| 55 | 54 | ||
| 56 | ======= | ||
| 57 | >>>>>>> trunk | ||
| 58 | extern GtkWidget *emacs_fixed_new (struct frame *f); | 55 | extern GtkWidget *emacs_fixed_new (struct frame *f); |
| 59 | extern GType emacs_fixed_get_type (void); | 56 | extern GType emacs_fixed_get_type (void); |
| 60 | 57 | ||