fix conflicts in nowdockview

8 years ago · 548e7b107a
parent 452322773e 8a3da51fe3
commit 548e7b107a
1 changed files with 1 additions and 0 deletions
--- a/corona/nowdockview.cpp
+++ b/corona/nowdockview.cpp
@ -119,6 +119,7 @@ void NowDockView::init()
    
    rootContext()->setContextProperty(QStringLiteral("dock"), this);
    engine()->rootContext()->setContextObject(new KLocalizedContext(this));
+
    // engine()->rootContext()->setContextProperty(QStringLiteral("dock"), this);
    setSource(corona()->kPackage().filePath("nowdockui"));