-
Committer:
l10n daemon script
-
Date:
2019-07-31 03:16:36 UTC
-
Revision ID:
git-v1:c2f17ae7fb61a39030f08b4a401da0e08b30614e
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"