Commit 0fa2bcd4 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 7df58d0d
Pipeline #2395 passed with stage
in 7 minutes and 12 seconds