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