-
Committer:
l10n daemon script
-
Date:
2018-10-10 04:18:58 UTC
-
Revision ID:
git-v1:6a9b8df31ae23171dda648e0ce91cf12e3f0b746
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"