-
Committer:
l10n daemon script
-
Date:
2020-08-21 04:07:49 UTC
-
Revision ID:
git-v1:d3167189a6c08b2f7ba399405d85ccb698dbbf43
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"