-
Committer:
l10n daemon script
-
Date:
2021-09-08 01:22:53 UTC
-
Revision ID:
git-v1:7a7dc088d30681b7b7e6a8f40a6fb2d60b760f97
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"