-
Committer:
l10n daemon script
-
Date:
2018-07-08 03:14:53 UTC
-
Revision ID:
git-v1:51bd35b36eaf0928433024a5385652afffbf9c0a
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"