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