aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Camp <campd@src.gnome.org>2001-06-21 02:29:52 +0800
committerDave Camp <campd@src.gnome.org>2001-06-21 02:29:52 +0800
commit20d0d5e0056acaf546110ecca1d0a9562d86b387 (patch)
treec9875f672470fac9a19b6263b542a62e92551f3c
parent90aba2dbfde59bd7b48d127a463e545a05301e76 (diff)
downloadgsoc2013-evolution-20d0d5e0056acaf546110ecca1d0a9562d86b387.tar.gz
gsoc2013-evolution-20d0d5e0056acaf546110ecca1d0a9562d86b387.tar.zst
gsoc2013-evolution-20d0d5e0056acaf546110ecca1d0a9562d86b387.zip
removed conflict marker.
svn path=/trunk/; revision=10344
-rw-r--r--calendar/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index ded9f6d2d7..9869fe6560 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -28,7 +28,6 @@
* gui/dialogs/send-comp.c (send_component_dialog): remove useless
assignment
->>>>>>> 1.910
2001-06-20 Rodrigo Moya <rodrigo@ximian.com>
* idl/evolution-calendar.idl: added getFreeBusy method