Files @ f8314738030a
Branch filter:

Location: kallithea/docs/dev/translation.rst - annotation

f8314738030a 61 B text/prs.fallenstein.rst Show Source Show as Raw Download as Raw
Mads Kiilerich
scripts/i18n: let 'normalized-merge' leave 3-way conflict markers in output file

3-way conflict markers in the output file can be convenient ... and they do no
harm when merge tools like kdiff3 will overwrite output anyway.
.. _translations:
.. include:: ./../../kallithea/i18n/how_to