Commit 2f484c32 authored by Christoph Cullmann's avatar Christoph Cullmann 🐮
Browse files

remove merge conflict

parent dfcfb426
......@@ -297,14 +297,8 @@ void KateConfigDialog::removePluginPage(KTextEditor::Plugin *plugin)
qCDebug(LOG_KATE) << remove.count();
while (!remove.isEmpty()) {
KPageWidgetItem *wItem = remove.takeLast();
<<<<<<< HEAD
PluginPageListItem *pItem = m_pluginPages.take(wItem);
delete pItem->pluginPage;
=======
PluginPageListItem item = m_pluginPages.take(wItem);
delete item.pluginPage;
delete item.pageParent;
>>>>>>> work/fix-leaks-in-config
removePage(wItem);
}
}
......
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