-
Committer:
l10n daemon script
-
Date:
2020-08-26 04:19:17 UTC
-
Revision ID:
git-v1:04956126c240cbe52c56d6b0b7a7add1aa99c49c
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"