-
Committer:
l10n daemon script
-
Date:
2018-05-19 04:04:12 UTC
-
Revision ID:
git-v1:dbffd4b1dd0eb3590cd6290629078b970c524e7e
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"