From 79e662f99e144d6ad8d14d720315f131325ee2ae Mon Sep 17 00:00:00 2001 From: Chenthill Palanisamy Date: Mon, 10 Jul 2006 10:42:58 +0000 Subject: Fixes #332911 svn path=/trunk/; revision=32268 --- calendar/ChangeLog | 1 - 1 file changed, 1 deletion(-) (limited to 'calendar/ChangeLog') diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 973136dba8..49f7b11489 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -38,7 +38,6 @@ (alarm_to_malarm_widgets); (populate_widgets_from_alarm): Handle mail alarm. ->>>>>>> 1.3068 2006-06-30 Johnny Jacob * gui/cal-search-bar.c: (get_current_category), (get_category_sexp), (notify_e_cal_view_contains), -- cgit v1.2.3