1 files changed, 1 insertions, 0 deletions
diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h
index 706d05d..799c297 100644
--- a/korganizer/calendarview.h
+++ b/korganizer/calendarview.h
@@ -138,6 +138,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
    KOEventViewerDialog* getEventViewerDialog();
    Incidence *currentSelection();
    void checkSuspendAlarm();
+    void mergeFile( QString fn );
  signals:
    void save ();

diff --git a/korganizer/calendarview.h b/korganizer/calendarview.h index 706d05d..799c297 100644 --- a/korganizer/calendarview.h +++ b/korganizer/calendarview.h
@@ -138,6 +138,7 @@ class CalendarView : public KOrg::CalendarViewBase, public KCal::Calendar::Obser
138	KOEventViewerDialog* getEventViewerDialog();	138	KOEventViewerDialog* getEventViewerDialog();
139	Incidence *currentSelection();	139	Incidence *currentSelection();
140	void checkSuspendAlarm();	140	void checkSuspendAlarm();
		141	void mergeFile( QString fn );
141		142
142	signals:	143	signals:
143	void save ();	144	void save ();