diff options
| author | madelinegr <mgriswold99@gmail.com> | 2019-02-18 18:27:38 -0500 |
|---|---|---|
| committer | madelinegr <mgriswold99@gmail.com> | 2019-02-18 18:27:38 -0500 |
| commit | 31e1f193f4c57475628e7f6e5662721efc0a54c4 (patch) | |
| tree | 9a39b387e3e25ac7bafd68132d78abed24446fad /src | |
| parent | b5de5ca84389f786124d475f9fac0f833f330dd0 (diff) | |
merge and install
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index d06423755..9d5548525 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -11,12 +11,8 @@ import { CollectionSchemaView } from "../collections/CollectionSchemaView"; import { CollectionViewBase, COLLECTION_BORDER_WIDTH } from "../collections/CollectionViewBase"; import { FormattedTextBox } from "../nodes/FormattedTextBox"; import { ImageBox } from "../nodes/ImageBox"; -<<<<<<< HEAD import { WebBox } from "../nodes/WebBox"; -import "./NodeView.scss"; -======= import "./DocumentView.scss"; ->>>>>>> 3f98d6ec6050e7faa15179871f0d9669c1188a78 import React = require("react"); import { Transform } from "../../util/Transform"; const JsxParser = require('react-jsx-parser').default;//TODO Why does this need to be imported like this? |