From 2caf83083f184f22bfd44a87783a791ce5545951 Mon Sep 17 00:00:00 2001
From: Niqui O'Neill <doneill@ncsu.edu>
Date: Wed, 25 Nov 2020 12:08:30 -0800
Subject: [PATCH] merge fixes

---
 src/editor/widgets/comment/Comment.jsx      | 1 +
 src/editor/widgets/comment/TypeDropdown.jsx | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/editor/widgets/comment/Comment.jsx b/src/editor/widgets/comment/Comment.jsx
index 1f3462a..9745091 100644
--- a/src/editor/widgets/comment/Comment.jsx
+++ b/src/editor/widgets/comment/Comment.jsx
@@ -56,6 +56,7 @@ const Comment = props => {
         onChange={onUpdateComment} 
         onSaveAndClose={props.onSaveAndClose}
       />
+      { creatorInfo }
       { props.purpose == true &&
         <TypeDropdown  
             editable={isEditable}
diff --git a/src/editor/widgets/comment/TypeDropdown.jsx b/src/editor/widgets/comment/TypeDropdown.jsx
index 9ca684a..4be703a 100644
--- a/src/editor/widgets/comment/TypeDropdown.jsx
+++ b/src/editor/widgets/comment/TypeDropdown.jsx
@@ -1,5 +1,4 @@
 import React, { Component } from 'preact/compat';
-import ContentEditable from 'react-contenteditable';
 import i18n from '../../../i18n';
 import Select from 'react-select';