diff options
| author | madelinegr <mgriswold99@gmail.com> | 2019-03-02 19:00:57 -0500 |
|---|---|---|
| committer | madelinegr <mgriswold99@gmail.com> | 2019-03-02 19:00:57 -0500 |
| commit | 9b63097989d7a1bfb803b27935959945aacfae5f (patch) | |
| tree | 9a3364ba52954d9dd8b9a1928a4f4b8fa56d3781 /src/client/views/nodes | |
| parent | b30d129dfd0f7c4a462a0af1dde13a9a0d1699fc (diff) | |
changing presentaiton view width
Diffstat (limited to 'src/client/views/nodes')
| -rw-r--r-- | src/client/views/nodes/DocumentView.tsx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/client/views/nodes/DocumentView.tsx b/src/client/views/nodes/DocumentView.tsx index 5110f404d..e2b3f9833 100644 --- a/src/client/views/nodes/DocumentView.tsx +++ b/src/client/views/nodes/DocumentView.tsx @@ -20,11 +20,8 @@ import { KeyValueBox } from "./KeyValueBox" import { WebBox } from "../nodes/WebBox"; import "./DocumentView.scss"; import React = require("react"); -<<<<<<< HEAD import { PresentationView } from "../PresentationView"; -======= import { CollectionViewProps } from "../collections/CollectionViewBase"; ->>>>>>> bde8aabad7e5745b4797e73b564e4efb19faeca9 const JsxParser = require('react-jsx-parser').default;//TODO Why does this need to be imported like this? |