-
Committer:
l10n daemon script
-
Date:
2017-12-13 05:59:44 UTC
-
Revision ID:
git-v1:21e22ede30505f13fc4d60f88ab7fe8189ad0085
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"