-
Committer:
l10n daemon script
-
Date:
2018-07-18 03:31:15 UTC
-
Revision ID:
git-v1:0b760687112c40f1c6822bc6af11e3aa72dff959
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"