diff options
| author | Nikos Charonitakis <frolix68@src.gnome.org> | 2004-01-13 22:38:42 +0800 |
|---|---|---|
| committer | Nikos Charonitakis <frolix68@src.gnome.org> | 2004-01-13 22:38:42 +0800 |
| commit | 33e1b1aac8888beac570972b6c44ae88d3d7ec48 (patch) | |
| tree | fd56020af84814299efffc09ea972215a2ada3c7 | |
| parent | b9c0cfb4503080f3b03e58f5b14375bdccc2f6ad (diff) | |
| download | gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.tar gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.tar.gz gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.tar.bz2 gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.tar.lz gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.tar.xz gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.tar.zst gsoc2013-epiphany-33e1b1aac8888beac570972b6c44ae88d3d7ec48.zip | |
remove conflict indicators
| -rw-r--r-- | po/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/po/ChangeLog b/po/ChangeLog index fd31ecca5..d06fe44e2 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -39,7 +39,6 @@ * pt_BR.po: updated translation, by Joao Emanuel <deathbird1981@yahoo.com.br> ->>>>>>> 1.433 2004-01-10 Danilo Šegan <dsegan@gmx.net> * sr.po, sr@Latn.po: Updated Serbian translation. |