Fix merge conflicts

src/cantor.cpp

@@ -671,11 +671,6 @@ void CantorShell::updatePanel()
     }
 
     QList<Cantor::PanelPlugin*> plugins=handler->plugins();
-<<<<<<< HEAD
-    const bool isNewWorksheet = !m_pluginsVisibility.contains(m_part);
-
-=======
->>>>>>> master
     foreach(Cantor::PanelPlugin* plugin, plugins)
     {
         if(plugin==nullptr)

src/cantor_part.h

@@ -86,7 +86,7 @@ Q_SIGNALS:
     void worksheetSave(const QUrl& url);
     void requestOpenWorksheet(const QUrl& url);
     void setBackendName(const QString& name);
-    void requestDocumentation(const QString&);
+    void requestDocumentation(const QString& keyword);
 
 public Q_SLOTS:
     void updateCaption();