-
Committer:
l10n daemon script
-
Date:
2018-05-19 04:09:47 UTC
-
Revision ID:
git-v1:05e069396fb55eb6729dc7116ce7a34a93056861
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"