diff options
| author | Martin Kretzschmar <martink@src.gnome.org> | 2005-07-02 15:08:14 (GMT) |
|---|---|---|
| committer | Martin Kretzschmar <martink@src.gnome.org> | 2005-07-02 15:08:14 (GMT) |
| commit | 30ab21a355281cee3960062ab616ab8b4fa795ca (patch) | |
| tree | 14de5332bcdfcc61b599d714b1f16e5342fdae8f /po | |
| parent | de3612f2a4b46b555edc50ca344a04bc3a8f7280 (diff) | |
Removed conflict markers from ChangeLog
Diffstat (limited to 'po')
| -rw-r--r-- | po/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index 6a8867a..4f3e15b 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -294,7 +294,6 @@ * cs.po: Updated Czech translation. ->>>>>>> 1.143 2005-04-08 Adam Weinberger <adamw@gnome.org> * en_CA.po: Updated Canadian English translation. |