Skip to content
Snippets Groups Projects
Commit a02264d7 authored by Emil's avatar Emil
Browse files

Merge branch 'dev' of...

Merge branch 'dev' of https://gitlab.liu.se/tddd96-grupp11/teknikattan-scoring-system into 122-show-question-components-in-editor
parents 2505e072 214b797b
No related branches found
No related tags found
1 merge request!126Resolve "Show question components in editor"
...@@ -213,7 +213,7 @@ const PresentationEditorPage: React.FC = () => { ...@@ -213,7 +213,7 @@ const PresentationEditorPage: React.FC = () => {
<Content leftDrawerWidth={leftDrawerWidth} rightDrawerWidth={rightDrawerWidth}> <Content leftDrawerWidth={leftDrawerWidth} rightDrawerWidth={rightDrawerWidth}>
<InnerContent> <InnerContent>
{competitionLoading && <SlideDisplay variant="editor" activeViewTypeId={activeViewTypeId} />} <SlideDisplay variant="editor" activeViewTypeId={activeViewTypeId} />
</InnerContent> </InnerContent>
</Content> </Content>
<Menu <Menu
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment