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 74364c02be9e8d89762f0b80a1c011dcd1646abe in kde:breeze

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