SVN_SILENT made messages (.desktop file) - always resolve ours
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"

Commit 80a263f6917155cfaf43741b6ea5db04793c1096 in kde:breeze

KDE/breeze-icons,lcorbasson/kde-breeze-icons,KDE/breeze-icons,lcorbasson/kde-breeze-icons,KDE/breeze-icons,KDE/breeze-icons,KDE/breeze-icons