-
Committer:
l10n daemon script
-
Date:
2019-11-12 04:35:44 UTC
-
Revision ID:
git-v1:18af90782438ea8e1734c908b1992f9a78b605f2
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"