From 616d71c6ad8b15b9736ada0754c557c2a81964bc Mon Sep 17 00:00:00 2001
From: kimdahey <claire_kim1@brown.edu>
Date: Mon, 19 Aug 2019 15:07:31 -0400
Subject: fixed errors

---
 src/client/views/MetadataEntryMenu.tsx | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/client/views/MetadataEntryMenu.tsx b/src/client/views/MetadataEntryMenu.tsx
index aed84768e..06084aac0 100644
--- a/src/client/views/MetadataEntryMenu.tsx
+++ b/src/client/views/MetadataEntryMenu.tsx
@@ -22,7 +22,6 @@ export class MetadataEntryMenu extends React.Component<MetadataEntryProps>{
     @observable private suggestions: string[] = [];
     private _addChildren: boolean = false;
     private userModified = false;
-    private _addChildren = false;
 
     private autosuggestRef = React.createRef<Autosuggest>();
 
@@ -85,11 +84,6 @@ export class MetadataEntryMenu extends React.Component<MetadataEntryProps>{
             e.stopPropagation();
             const script = KeyValueBox.CompileKVPScript(this._currentValue);
             if (!script) return;
-<<<<<<< HEAD
-=======
-            // add optional adding here
-            let docs = Array<Doc>();
->>>>>>> e7883760751d053133c8bb9b867509fa23f40b68
 
             let doc = this.props.docs;
             if (typeof doc === "function") {
@@ -193,13 +187,8 @@ export class MetadataEntryMenu extends React.Component<MetadataEntryProps>{
                     ref={this.autosuggestRef} />
                 Value:
                 <input className="metadataEntry-input" value={this._currentValue} onChange={this.onValueChange} onKeyDown={this.onValueKeyDown} />
-<<<<<<< HEAD
-        Children:
-        <input type="checkbox" onChange={this.onClick} ></input>
-=======
-                Spread to children:
-                <input type="checkbox" onChange={this.onClick} checked={this._addChildren}></input>
->>>>>>> e7883760751d053133c8bb9b867509fa23f40b68
+                Children:
+                <input type="checkbox" onChange={this.onClick} ></input>
             </div >
         );
     }
-- 
cgit v1.2.3-70-g09d2