-
Committer:
l10n daemon script
-
Date:
2020-09-17 04:10:49 UTC
-
Revision ID:
git-v1:4ae7cdeb2b4f006fb9a39b51ac81c52bd7e9e77c
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"