aboutsummaryrefslogtreecommitdiffstats
path: root/calendar/ChangeLog
diff options
context:
space:
mode:
authorFederico Mena Quintero <federico@src.gnome.org>2000-07-09 07:43:56 +0800
committerFederico Mena Quintero <federico@src.gnome.org>2000-07-09 07:43:56 +0800
commitce3c2273262985f373126cc7fe4041c5da94d362 (patch)
tree7c974da84bad22d7ce84af29e3d05722a9bf459f /calendar/ChangeLog
parent2f2ff6d4cc13fccff5bdc3a0370b101cf539fb2a (diff)
downloadgsoc2013-evolution-ce3c2273262985f373126cc7fe4041c5da94d362.tar.gz
gsoc2013-evolution-ce3c2273262985f373126cc7fe4041c5da94d362.tar.zst
gsoc2013-evolution-ce3c2273262985f373126cc7fe4041c5da94d362.zip
Remove conflict markers - Federico
svn path=/trunk/; revision=3983
Diffstat (limited to 'calendar/ChangeLog')
-rw-r--r--calendar/ChangeLog1
1 files changed, 0 insertions, 1 deletions
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