-
Committer:
l10n daemon script
-
Date:
2020-06-06 03:00:40 UTC
-
Revision ID:
git-v1:83e975829788ffc4842509a6ee61d5d3c339ea87
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"