-
Committer:
l10n daemon script
-
Date:
2020-07-20 03:12:22 UTC
-
Revision ID:
git-v1:e14778ba3d18f628e08a5bb3b90635d0b7b3c538
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"