From 31e1f193f4c57475628e7f6e5662721efc0a54c4 Mon Sep 17 00:00:00 2001
From: madelinegr <mgriswold99@gmail.com>
Date: Mon, 18 Feb 2019 18:27:38 -0500
Subject: merge and install

---
 src/client/views/nodes/DocumentView.tsx | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/client/views/nodes/DocumentView.tsx')

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?
-- 
cgit v1.2.3-70-g09d2

