-
Committer:
l10n daemon script
-
Date:
2022-06-07 02:24:14 UTC
-
Revision ID:
git-v1:4b570442896fd6a1a324ef950cdf13dc53b20017
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"