-
Committer:
l10n daemon script
-
Date:
2018-04-08 03:33:47 UTC
-
Revision ID:
git-v1:c38f3f3769a6126f5591bd5670895da5b1e75c28
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"