-
Committer:
l10n daemon script
-
Date:
2018-10-10 04:53:36 UTC
-
Revision ID:
git-v1:cbe5366a8e17ad387a823600f8c55fc2f7c48dce
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"