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

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