-
Committer:
l10n daemon script
-
Date:
2019-06-12 03:27:17 UTC
-
Revision ID:
git-v1:2b591f0f1cab43280049e44fd3c50a34ee58028b
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"