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