D16951: Resolve merge conflict

[Nicolas Fella]

nicolasfella edited the summary of this revision.
nicolasfella edited the test plan for this revision.

REPOSITORY
  R266 Breeze Icons

BRANCH
  arcpatch-D16951

REVISION DETAIL
  https://phabricator.kde.org/D16951

To: ndavis, #vdg, ngraham, nicolasfella, #kde_connect
Cc: cfeck, trickyricky26, abetts, ngraham, rizzitello, nicolasfella, kde-frameworks-devel, michaelh, bruns
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-frameworks-devel/attachments/20181122/e2b21dd7/attachment.html>