merge fixes
This commit is contained in:
parent
ffd6fc5c00
commit
2caf83083f
|
@ -56,6 +56,7 @@ const Comment = props => {
|
||||||
onChange={onUpdateComment}
|
onChange={onUpdateComment}
|
||||||
onSaveAndClose={props.onSaveAndClose}
|
onSaveAndClose={props.onSaveAndClose}
|
||||||
/>
|
/>
|
||||||
|
{ creatorInfo }
|
||||||
{ props.purpose == true &&
|
{ props.purpose == true &&
|
||||||
<TypeDropdown
|
<TypeDropdown
|
||||||
editable={isEditable}
|
editable={isEditable}
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
import React, { Component } from 'preact/compat';
|
import React, { Component } from 'preact/compat';
|
||||||
import ContentEditable from 'react-contenteditable';
|
|
||||||
import i18n from '../../../i18n';
|
import i18n from '../../../i18n';
|
||||||
import Select from 'react-select';
|
import Select from 'react-select';
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue