Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Education
Cantor
Commits
daf67c44
Commit
daf67c44
authored
Jul 07, 2020
by
Shubham .
Browse files
Fix merge conflicts
parent
81c80f90
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/cantor.cpp
View file @
daf67c44
...
...
@@ -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
View file @
daf67c44
...
...
@@ -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
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment