-
Committer:
l10n daemon script
-
Date:
2020-07-06 03:32:26 UTC
-
Revision ID:
git-v1:e973a5169f18ca862ceb8ad749c93cd621d86e14
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"