mart updated this revision to Diff 13140. mart added a comment.
- use activate - remove change made by mistake - fix merge errors REPOSITORY R120 Plasma Workspace CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D4893?vs=13138&id=13140 BRANCH arcpatch-D4893_1 REVISION DETAIL https://phabricator.kde.org/D4893 AFFECTED FILES klipper/autotests/modeltest.cpp lookandfeel/contents/lockscreen/LockScreenUi.qml lookandfeel/contents/lockscreen/MainBlock.qml To: mart, graesslin, #plasma Cc: plasma-devel, progwolff, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol
