-
Committer:
l10n daemon script
-
Date:
2020-02-14 04:50:54 UTC
-
Revision ID:
git-v1:48f7bf19b3b7441ba361795ee2fbf1f91a34a011
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"