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"
1 job for master
Status Job ID Name Coverage
failed #41099
linux kf5-qt5 qt5.12

Name Stage Failure
linux kf5-qt5 qt5.12 Build There has been a timeout failure or the job got stuck. Check your timeout limits or try again
No job log