diff options
Diffstat (limited to 'calendar/gui/e-calendar-view.c')
| -rw-r--r-- | calendar/gui/e-calendar-view.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c index fd8650edad..e80d894a3b 100644 --- a/calendar/gui/e-calendar-view.c +++ b/calendar/gui/e-calendar-view.c @@ -75,9 +75,18 @@ struct _ECalendarViewPrivate { /* The default category */ gchar *default_category; +<<<<<<< HEAD GtkTargetList *copy_target_list; GtkTargetList *paste_target_list; }; +======= +#ifdef G_OS_WIN32 +const ECompEditorRegistry * const comp_editor_get_registry(); +#define comp_editor_registry comp_editor_get_registry() +#else +extern ECompEditorRegistry *comp_editor_registry; +#endif +>>>>>>> 90cd900... Without this evo 2.28.2 will not link/run at all enum { PROP_0, |