-
Committer:
l10n daemon script
-
Date:
2020-08-20 04:18:49 UTC
-
Revision ID:
git-v1:0cb28f118a512930d6e6196aa2c8979914d24858
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"