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 in 13 minutes and 47 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #39778
linux kf5-qt5 qt5.12

00:13:47

0.0%