l10n daemon script d81df24e7c 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"

2023-01-23 01:56:42 +00:00

2.3 KiB

Raw Blame History

View Raw