zzag updated this revision to Diff 83261. zzag added a comment.
Fix merge conflict. REPOSITORY R242 Plasma Framework (Library) CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D26503?vs=74590&id=83261 BRANCH port-to-shadows-api REVISION DETAIL https://phabricator.kde.org/D26503 AFFECTED FILES src/plasmaquick/dialogshadows.cpp src/plasmaquick/dialogshadows_p.h src/plasmaquick/waylandintegration.cpp src/plasmaquick/waylandintegration_p.h To: zzag, #plasma Cc: kde-frameworks-devel, LeGast00n, cblack, michaelh, ngraham, bruns
