D16951: Resolve merge conflict

[Noah Davis]

This revision was automatically updated to reflect the committed changes.
Closed by commit R266:2a85454d7a42: Resolve merge conflict (authored by ndavis).

REPOSITORY
  R266 Breeze Icons

CHANGES SINCE LAST UPDATE
  https://phabricator.kde.org/D16951?vs=45981&id=45982

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

AFFECTED FILES
  icons-dark/actions/16/dialog-input-devices.svg
  icons/actions/16/dialog-input-devices.svg

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/kdeconnect/attachments/20181122/de38ce47/attachment.html>