-
Committer:
l10n daemon script
-
Date:
2021-03-27 05:13:18 UTC
-
Revision ID:
git-v1:95fc5029bb5765a5af278ca836bbc67aa86d6d5c
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"