cblack updated this revision to Diff 63207. cblack added a comment.
Fix the rebase shenanigans REPOSITORY R119 Plasma Desktop CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D22844?vs=63196&id=63207 BRANCH kcm-colors-gtk (branched from master) REVISION DETAIL https://phabricator.kde.org/D22844 AFFECTED FILES kcms/colors/colors.cpp kcms/colors/colors.h kcms/krdb/krdb.cpp kcms/krdb/krdb.h kcms/style/kcmstyle.cpp To: cblack, #plasma, ngraham Cc: ahiemstra, ngraham, davidre, broulik, plasma-devel, LeGast00n, jraleigh, fbampaloukas, GB_2, ragreen, Pitel, ZrenBot, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, mart