-
Committer:
l10n daemon script
-
Date:
2018-02-18 03:57:23 UTC
-
Revision ID:
git-v1:c77c0910fdb1e69eadb16af80fc968fab79c4814
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"