-
Committer:
l10n daemon script
-
Date:
2019-09-30 03:16:06 UTC
-
Revision ID:
git-v1:46376685ef1d35c1c920099ef42102ca8e068f66
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"