-
Committer:
l10n daemon script
-
Date:
2020-02-17 04:41:49 UTC
-
Revision ID:
git-v1:764710b5825417497e90468d5a5a9ab28cdb19e9
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"