ngraham added a comment.
This doesn't apply for me (conflict in `Applet.qml`); could you rebase on master? REPOSITORY R120 Plasma Workspace REVISION DETAIL https://phabricator.kde.org/D12857 To: miklosm, #plasma, mart Cc: ngraham, mart, plasma-devel, ragreen, Pitel, ZrenBot, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol
