Fix minor conflicts.

svn path=/trunk/; revision=5017

1 files changed, 19 insertions, 20 deletions

diff --git a/libical/src/libicalss/icalcalendar.h b/libical/src/libicalss/icalcalendar.h
index 90e7b33c22..f07457c60d 100644
--- a/libical/src/libicalss/icalcalendar.h
+++ b/libical/src/libicalss/icalcalendar.h
@@ -7,19 +7,19 @@
  $Id$
  $Locker$
 
- (C) COPYRIGHT 1999 Eric Busboom
- http://www.softwarestudio.org
-
- The contents of this file are subject to the Mozilla Public License
- Version 1.0 (the "License"); you may not use this file except in
- compliance with the License. You may obtain a copy of the License at
- http://www.mozilla.org/MPL/
- 
- Software distributed under the License is distributed on an "AS IS"
- basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
- the License for the specific language governing rights and
- limitations under the License.
- 
+ (C) COPYRIGHT 2000, Eric Busboom, http://www.softwarestudio.org
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of either: 
+
+    The LGPL as published by the Free Software Foundation, version
+    2.1, available at: http://www.fsf.org/copyleft/lesser.html
+
+  Or:
+
+    The Mozilla Public License Version 1.0. You may obtain a copy of
+    the License at http://www.mozilla.org/MPL/
+
  The Original Code is eric. The Initial Developer of the Original
  Code is Eric Busboom
 
@@ -30,12 +30,11 @@
 #define ICALCALENDAR_H
 
 #include "ical.h"
-#include "icalstore.h"
-#include "icalcluster.h"
+#include "icalset.h"
 
 /* icalcalendar
  * Routines for storing calendar data in a file system. The calendar 
- * has two icalstores, one for incoming components and one for booked
+ * has two icaldirsets, one for incoming components and one for booked
  * components. It also has interfaces to access the free/busy list
  * and a list of calendar properties */
 
@@ -53,13 +52,13 @@ int icalcalendar_islocked(icalcalendar* calendar);
 
 int icalcalendar_ownlock(icalcalendar* calendar);
 
-icalstore* icalcalendar_get_booked(icalcalendar* calendar);
+icalset* icalcalendar_get_booked(icalcalendar* calendar);
 
-icalcluster* icalcalendar_get_incoming(icalcalendar* calendar);
+icalset* icalcalendar_get_incoming(icalcalendar* calendar);
 
-icalcluster* icalcalendar_get_properties(icalcalendar* calendar);
+icalset* icalcalendar_get_properties(icalcalendar* calendar);
 
-icalcluster* icalcalendar_get_freebusy(icalcalendar* calendar);
+icalset* icalcalendar_get_freebusy(icalcalendar* calendar);
 
 
 #endif /* !ICALCALENDAR_H */