-
Committer:
l10n daemon script
-
Date:
2021-02-15 06:16:59 UTC
-
Revision ID:
git-v1:75e3f3d59777b1ae2b9d032ecb32b1fe7f079f9a
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"