From 20d0d5e0056acaf546110ecca1d0a9562d86b387 Mon Sep 17 00:00:00 2001
From: Dave Camp <campd@src.gnome.org>
Date: Wed, 20 Jun 2001 18:29:52 +0000
Subject: removed conflict marker.

svn path=/trunk/; revision=10344
---
 calendar/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v1.2.3