ngraham added a comment.
Sorry, I actually broke it in my attempt to rebase it so that it lands. You
need to do the rebase on top of master:
git checkout master
git pull
git checkout [your branch]
git pull --rebase origin master
arc diff
REPOSITORY
R97 Bluedevil
REVISION DETAIL
https://phabricator.kde.org/D28467
To: niccolove, #plasma, ngraham
Cc: ngraham, plasma-devel, Orage, LeGast00n, The-Feren-OS-Dev, cblack,
jraleigh, zachus, fbampaloukas, ragreen, ZrenBot, himcesjf, lesliezhai,
ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart
