ngraham updated this revision to Diff 80762. ngraham added a comment.
Don't include merge conflict bits lol REPOSITORY R31 Breeze CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D28317?vs=80760&id=80762 BRANCH tools-area-color-changes (branched from master) REVISION DETAIL https://phabricator.kde.org/D28317 AFFECTED FILES colors/Breeze.colors colors/BreezeLight.colors kdecoration/breezebutton.cpp kdecoration/breezesettingsdata.kcfg kstyle/breezetoolsareamanager.cpp To: ngraham, #vdg, #breeze Cc: ndavis, niccolove, The-Feren-OS-Dev, manueljlin, davidre, broulik, plasma-devel, Orage, LeGast00n, cblack, jraleigh, zachus, fbampaloukas, ragreen, ZrenBot, ngraham, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart
