diff options
Diffstat (limited to 'po/ChangeLog')
-rw-r--r-- | po/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 73e32f902a..f73fcb264c 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -44,7 +44,6 @@ * no.po: Updated Norwegian (bokmål) translation. ->>>>>>> 1.618 2001-08-28 Christophe Merlet <redfox@eikonex.org> * fr.po: Updated French translation from contribution of |