-
Committer:
l10n daemon script
-
Date:
2021-01-02 06:03:05 UTC
-
Revision ID:
git-v1:b859a8485e18e00cef1acaefc10735dc32e6b1fa
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"