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

2024-12-16 01:37:31 +00:00

14 KiB

Raw Blame History

View Raw