Commit a3ae87b9 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 f1ab8b07
Pipeline #14461 passed with stage
in 8 minutes and 20 seconds