-
Committer:
l10n daemon script
-
Date:
2019-10-23 03:26:39 UTC
-
Revision ID:
git-v1:bc6ed9a3042fc895bdd5c6cf837897a470303c9e
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"