-
Committer:
l10n daemon script
-
Date:
2022-05-13 01:47:00 UTC
-
Revision ID:
git-v1:068d9d120d7057ef8ae1e4513f6482475a59df2c
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"