-
Committer:
l10n daemon script
-
Date:
2019-12-11 04:45:10 UTC
-
Revision ID:
git-v1:108b25cb160f51b1c2dcfccf3020d8c385d49014
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"