-
Committer:
l10n daemon script
-
Date:
2019-07-05 03:18:24 UTC
-
Revision ID:
git-v1:69a95966445a710c05eea2b7dcef8105e03433cf
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"