-
Committer:
l10n daemon script
-
Date:
2020-05-03 04:00:43 UTC
-
Revision ID:
git-v1:197c92314b9b6d3134f239a64d56871cbf5ef9ae
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"