-
Committer:
l10n daemon script
-
Date:
2021-01-04 05:41:45 UTC
-
Revision ID:
git-v1:a0a54baf6d66aca1f9107137154b5bec80eeacf0
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"