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 9 minutes and 17 seconds (queued for 18 minutes and 56 seconds)
Status Job ID Name Coverage
  Build
failed #52443
flatpak
flatpak

00:09:17

 
Name Stage Failure
failed
flatpak Build
  CMakeLists.txt:10 (feature_summary)


-- Configuring incomplete, errors occurred!
See also "/run/build/kdelibs4support/_flatpak_build/CMakeFiles/CMakeOutput.log".
Error: module kdelibs4support: Child process exited with code 1
Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1