From 03b35e3d6346800821bb830a7c102dede74647fe Mon Sep 17 00:00:00 2001 From: laurawilsonri Date: Sun, 24 Feb 2019 17:40:47 -0500 Subject: Got it compiling --- src/client/views/nodes/FormattedTextBox.scss | 5 ----- src/client/views/nodes/FormattedTextBox.tsx | 5 +---- 2 files changed, 1 insertion(+), 9 deletions(-) (limited to 'src/client/views/nodes') diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss index 12604f843..97d7f1426 100644 --- a/src/client/views/nodes/FormattedTextBox.scss +++ b/src/client/views/nodes/FormattedTextBox.scss @@ -9,11 +9,6 @@ } .formattedTextBox-cont { -<<<<<<< HEAD background: white; padding: 1vw; -======= - background: beige; - padding: 0; ->>>>>>> d9d55e422826da1fe87aa7973c92e54bc0c99f02 } \ No newline at end of file diff --git a/src/client/views/nodes/FormattedTextBox.tsx b/src/client/views/nodes/FormattedTextBox.tsx index 194d5636c..4a6560dc9 100644 --- a/src/client/views/nodes/FormattedTextBox.tsx +++ b/src/client/views/nodes/FormattedTextBox.tsx @@ -9,18 +9,15 @@ import { EditorView } from "prosemirror-view"; import { Node } from "prosemirror-model"; import { Opt, FieldWaiting, FieldValue } from "../../../fields/Field"; import "./FormattedTextBox.scss"; -import { KeyStore } from "../../../fields/Key"; +import { KeyStore } from "../../../fields/KeyStore"; import React = require("react") import { RichTextField } from "../../../fields/RichTextField"; import { FieldViewProps, FieldView } from "./FieldView"; -<<<<<<< HEAD import { CollectionFreeFormDocumentView } from "./CollectionFreeFormDocumentView"; import { observer } from "mobx-react"; import { Schema, DOMParser } from "prosemirror-model" import { Plugin } from 'prosemirror-state' import { Decoration, DecorationSet } from 'prosemirror-view' -======= ->>>>>>> d9d55e422826da1fe87aa7973c92e54bc0c99f02 // FormattedTextBox: Displays an editable plain text node that maps to a specified Key of a Document -- cgit v1.2.3-70-g09d2