Commit e8b6bb35 authored by Script Kiddy's avatar Script Kiddy

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"
parent a5fcbdd7
Pipeline #13206 passed with stages
in 25 minutes and 21 seconds