-
Committer:
l10n daemon script
-
Date:
2018-10-19 03:45:58 UTC
-
Revision ID:
git-v1:53d3f2d9ca51f2011413ac46859ee081b8beefcd
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"