-
Committer:
l10n daemon script
-
Date:
2019-11-20 04:28:37 UTC
-
Revision ID:
git-v1:2157d1ece90c4ea2367e643602b0b87bb3e1cb85
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"