-
Committer:
l10n daemon script
-
Date:
2020-04-13 04:14:00 UTC
-
Revision ID:
git-v1:55354b34b4cbd232f813c25f7f8a81f89cd6dcb8
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"