-
Committer:
l10n daemon script
-
Date:
2020-06-17 11:56:45 UTC
-
Revision ID:
git-v1:4ac7c93bff1b6ed830c652031fdf1b7b9aba5491
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"