diff options
| -rw-r--r-- | po/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 37021ea9a..060ef17b1 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -199,7 +199,6 @@ * de.po: Fixed/added translations with context marker. ->>>>>>> 1.960 2005-01-18 Frank Arnold <farnold@cvs.gnome.org> * de.po: Updated German translation. |