-
Committer:
l10n daemon script
-
Date:
2020-05-31 18:22:17 UTC
-
Revision ID:
git-v1:c022209e2728b4ea4575ea4fd583eaffdb8d91e8
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"