From ce3c2273262985f373126cc7fe4041c5da94d362 Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@src.gnome.org>
Date: Sat, 8 Jul 2000 23:43:56 +0000
Subject: Remove conflict markers - Federico

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

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 8c54a4caed..72d722fce5 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -24,7 +24,6 @@
 	(cal_component_set_dtend): Ditto.
 	(cal_component_set_due): Ditto.
 
->>>>>>> 1.434
 2000-07-06  Federico Mena Quintero  <federico@helixcode.com>
 
 	* cal-util/cal-component.c (scan_property): Handle the
-- 
cgit v1.2.3