-
Committer:
l10n daemon script
-
Date:
2020-04-05 04:04:17 UTC
-
Revision ID:
git-v1:95c7987e8ca0e8eb209364d305539a8a34fc9e18
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"