-
Committer:
l10n daemon script
-
Date:
2017-09-27 07:09:44 UTC
-
Revision ID:
git-v1:ad0d6abcbb3fd86c2649aaf8df1efd71beddd642
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"