diff options
Diffstat (limited to 'calendar')
| -rw-r--r-- | calendar/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 05f436b5cc..1386057623 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -112,7 +112,6 @@ * gui/cal-search-bar.h: Re-order the bit-values in accordance to re-ordered search-bar menu items. ->>>>>>> 1.2900 2005-12-20 P S Chakravarthi <pchakravarthi@novell.com> Fixes #323955 |