From 70676c2456f7f330869d6009b52456aba10e7e97 Mon Sep 17 00:00:00 2001
From: ab <abdullah_ahmed@brown.edu>
Date: Sat, 9 Mar 2019 16:17:34 -0500
Subject: idk

---
 src/client/views/DocumentDecorations.tsx | 9 ---------
 1 file changed, 9 deletions(-)

(limited to 'src')

diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 280fad2e5..7bddc298e 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -3,26 +3,17 @@ import React = require("react");
 import { SelectionManager } from "../util/SelectionManager";
 import { observer } from "mobx-react";
 import './DocumentDecorations.scss'
-<<<<<<< HEAD
 import { CollectionFreeFormView } from "./collections/CollectionFreeFormView";
 import ContentEditable from 'react-contenteditable'
 import { KeyStore } from '../../fields/Key'
-=======
-import { KeyStore } from '../../fields/KeyStore'
-import { NumberField } from "../../fields/NumberField";
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
 
 @observer
 export class DocumentDecorations extends React.Component<{}, { value: string }> {
     static Instance: DocumentDecorations
     private _resizer = ""
     private _isPointerDown = false;
-<<<<<<< HEAD
     @observable private _opacity = 1;
     private keyinput: React.RefObject<HTMLInputElement>;
-=======
-    @observable private _hidden = false;
->>>>>>> 96eede5f7d1706a3f7ac6ee02a85bb3da217f467
 
     constructor(props: Readonly<{}>) {
         super(props)
-- 
cgit v1.2.3-70-g09d2