fix

editors/demo/src/HHMI/HHMI.js

@@ -56,13 +56,8 @@ const Hhmi = () => {
         config={config}
         autoFocus
         fileUpload={file => renderImage(file)}
-<<<<<<< HEAD
-        value=""
-        // targetFormat="JSON"
-=======
         value={initialValue}
         targetFormat="JSON"
->>>>>>> create editor
         // readonly
         layout={HhmiLayout}
         onChange={source => console.log(source)}

editors/demo/src/HHMI/MultipleChoiceQuestionService/MultipleChoiceNodeView.js

@@ -57,6 +57,7 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
   }
 
   update(node) {
+<<<<<<< HEAD
     if (!node.sameMarkup(this.node)) return false;
     this.node = node;
     if (this.innerView) {
@@ -76,6 +77,9 @@ export default class MultipleChoiceNodeView extends AbstractNodeView {
         );
       }
     }
+=======
+    console.log('in nodes update');
+>>>>>>> fix
     return true;
   }
 }

editors/demo/src/HHMI/MultipleChoiceQuestionService/components/TestComponent.js

@@ -24,17 +24,14 @@ const EditorWrapper = styled.div`
   user-select: all;
 `;
 
-
 export default ({ node, view, getPos }) => {
   const [showExplanation, setShowExplanation] = useState(false);
- }
 
   const clickMe = () => {
     setShowExplanation(true);
     // view.dispatch(view.state.tr);
   };
 
-;
   return (
     <>
       <button onClick={clickMe}>Show Explanation</button>

wax-prosemirror-services/src/PortalService/AbstractNodeView.js

@@ -4,10 +4,13 @@ export default class AbstractNodeView {
   constructor(node, view, getPos, decorations, createPortal, Component) {
     this.dom = document.createElement('div');
     // this.dom.setAttribute('contenteditable', true);
+<<<<<<< HEAD
     const testDiv = document.createElement('div');
 
     testDiv.setAttribute('id', 'test');
     this.dom.append(testDiv);
+=======
+>>>>>>> fix
     this.dom.id = uuidv4();
     this.dom.classList.add('portal');