-
Committer:
l10n daemon script
-
Date:
2020-06-09 03:18:30 UTC
-
Revision ID:
git-v1:6da2f6ba46c164eb9e9e975afa9276977c4d18b4
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"