nicolasfella added a comment.
In D16951#363898 <https://phabricator.kde.org/D16951#363898>, @ndavis wrote: > So now I have 2 commits and one of them is already on master, but they're both called "Add mouse button icons" and use the same description. Should I update this diff to describe only the latest commit or make it apply to both? Just rename this one to something like "Resolve merge conflict" 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
