aboutsummaryrefslogtreecommitdiffstats
path: root/po/tk.po
diff options
context:
space:
mode:
authorJordi Mallach <jordim@src.gnome.org>2005-02-07 21:12:51 +0800
committerJordi Mallach <jordim@src.gnome.org>2005-02-07 21:12:51 +0800
commit242c50b9298e86069176e12417a3f364eb595321 (patch)
tree3a229b797b4ecfcc77646c19b717415f28d13527 /po/tk.po
parent4c5db59a331d7406e48d9b61941528d2b5834cd8 (diff)
downloadgsoc2013-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.
Diffstat (limited to 'po/tk.po')
0 files changed, 0 insertions, 0 deletions