-
Committer:
l10n daemon script
-
Date:
2018-08-12 03:45:39 UTC
-
Revision ID:
git-v1:610fd02a2fa62f05b99c0ceb3c0ec8f690b79460
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"