-
Committer:
l10n daemon script
-
Date:
2021-04-10 01:15:37 UTC
-
Revision ID:
git-v1:016047367b1d2e5d3979bd27f055277cf4dd05ac
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"