diff options
| author | Josep Puigdemont i Casamajó <joseppc@src.gnome.org> | 2006-02-04 21:36:36 +0800 |
|---|---|---|
| committer | Josep Puigdemont i Casamajó <joseppc@src.gnome.org> | 2006-02-04 21:36:36 +0800 |
| commit | 7049788b998721f6afb64c2849df915cf0afe688 (patch) | |
| tree | f14316a8b895aa649408dac3845f43d9dd0f1ef0 /po | |
| parent | 6254617ca1edbfb035122361b09ab2c5a243aeee (diff) | |
| download | gsoc2013-evolution-7049788b998721f6afb64c2849df915cf0afe688.tar.gz gsoc2013-evolution-7049788b998721f6afb64c2849df915cf0afe688.tar.zst gsoc2013-evolution-7049788b998721f6afb64c2849df915cf0afe688.zip | |
Resolve conflicts.
svn path=/trunk/; revision=31404
Diffstat (limited to 'po')
| -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. |