-
Committer:
l10n daemon script
-
Date:
2019-02-09 04:40:38 UTC
-
Revision ID:
git-v1:d66d2cdf60633c5cb073ad61656042f947a490df
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"