diff options
| author | Jordi Mallach <jordim@src.gnome.org> | 2005-02-07 21:12:51 +0800 |
|---|---|---|
| committer | Jordi Mallach <jordim@src.gnome.org> | 2005-02-07 21:12:51 +0800 |
| commit | 242c50b9298e86069176e12417a3f364eb595321 (patch) | |
| tree | 3a229b797b4ecfcc77646c19b717415f28d13527 | |
| parent | 4c5db59a331d7406e48d9b61941528d2b5834cd8 (diff) | |
| download | gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.tar gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.tar.gz gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.tar.bz2 gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.tar.lz gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.tar.xz gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.tar.zst gsoc2013-epiphany-242c50b9298e86069176e12417a3f364eb595321.zip | |
Remove bogus conflict marker.
| -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. |