-
Committer:
l10n daemon script
-
Date:
2021-01-10 05:40:28 UTC
-
Revision ID:
git-v1:7302ed4744022d4b13406b988c05940d1e9d46eb
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"