diff options
Diffstat (limited to 'calendar/ChangeLog')
| -rw-r--r-- | calendar/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 <jjohnny@novell.com> * gui/cal-search-bar.c: (get_current_category), (get_category_sexp), (notify_e_cal_view_contains), |