Commit daf67c44 authored by Shubham  .'s avatar Shubham .
Browse files

Fix merge conflicts

parent 81c80f90
......@@ -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)
......
......@@ -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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment