-
Committer:
l10n daemon script
-
Date:
2020-09-12 04:03:03 UTC
-
Revision ID:
git-v1:f353ba9731f48c205ce368e8cca709a229d67d74
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"