-
Committer:
l10n daemon script
-
Date:
2020-01-20 05:00:13 UTC
-
Revision ID:
git-v1:9f0de19e6c0133bf7ab002ad8dbaf86944d4d6ab
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"