-
Committer:
l10n daemon script
-
Date:
2019-01-06 04:37:27 UTC
-
Revision ID:
git-v1:c38c3e9b03ae724d3eca80fc13feabf8277deeb0
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"