diff options
| -rw-r--r-- | po/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 7150d87fa4..eae0d5037c 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -35,7 +35,6 @@ * en_CA.po: Updated Canadian English translation. ->>>>>>> 1.2452 2006-01-31 Ilkka Tuohela <hile@iki.fi> * fi.po: Updated Finnish translation. @@ -1699,7 +1698,6 @@ * POTFILES.in : Added missing exchange files. 2005-07-15 Shreyas Srinivasan <sshreyas@novell.com> ->>>>>>> 1.2099 *plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml : Add file for translation. |