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 v0.1 in 1 minute and 5 seconds (queued for 1 second)
latest
Status Name Job ID Coverage
  Build
failed android #50727

00:01:05

 
Name Stage Failure
failed
android Build
No dependencies
~/src ~
Cloning into 'extra-cmake-modules'...
fatal: unable to connect to anongit.kde.org:
anongit.kde.org[0: 185.85.125.73]: errno=Connection timed out

Running after_script
Uploading artifacts for failed job
ERROR: Job failed: exit code 1