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

2025-10-21 01:34:16 +00:00

2.9 KiB

Raw Blame History

View Raw