Fix the git conflicts Conflicts: plasma/declarativeimports/CMakeLists.txt plasma/declarativeimports/test/contents/ui/Gallery.qml |
||
---|---|---|
declarativeimports | ||
kpart | ||
remotewidgetshelper | ||
scriptengines | ||
tools | ||
Mainpage.dox |
Fix the git conflicts Conflicts: plasma/declarativeimports/CMakeLists.txt plasma/declarativeimports/test/contents/ui/Gallery.qml |
||
---|---|---|
declarativeimports | ||
kpart | ||
remotewidgetshelper | ||
scriptengines | ||
tools | ||
Mainpage.dox |