-
Committer:
l10n daemon script
-
Date:
2019-08-07 03:04:37 UTC
-
Revision ID:
git-v1:58adf20d3f9a8e449fe5b68dca67cfd0545f213f
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"