-
Committer:
l10n daemon script
-
Date:
2020-09-02 04:33:37 UTC
-
Revision ID:
git-v1:67ccf22bb3b9e0ecc4992a19cb4d3c9e24e4a487
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"