-
Committer:
l10n daemon script
-
Date:
2019-05-31 03:07:25 UTC
-
Revision ID:
git-v1:7713ebe71c1d882258153eae4e5f6451c40a5c2f
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"