-
Committer:
l10n daemon script
-
Date:
2020-09-06 03:59:46 UTC
-
Revision ID:
git-v1:f50a01f4cd8a71ff1f499a2689806b61a82a282b
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"