From 227e8443a9fc9ca0c3f2e02e85dbd80b26a8b7b2 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Mon, 22 Apr 2019 17:19:41 -0400
Subject: merge

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

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

diff --git a/src/client/views/nodes/FormattedTextBox.tsx b/src/client/views/nodes/FormattedTextBox.tsx
index a61f00fd0..29ed2da13 100644
--- a/src/client/views/nodes/FormattedTextBox.tsx
+++ b/src/client/views/nodes/FormattedTextBox.tsx
@@ -114,13 +114,8 @@ export class FormattedTextBox extends React.Component<(FieldViewProps & Formatte
                 }
             );
         } else {
-<<<<<<< HEAD
-            this._proxyReactionDisposer = reaction(() => { }/*this.props.isSelected()*/,
-                () => this.props.isSelected() && MainOverlayTextBox.Instance.SetTextDoc(this.props.Document, this.props.fieldKey, this._ref.current!, this.props.ScreenToLocalTransform()));
-=======
             this._proxyReactionDisposer = reaction(() => this.props.isSelected(),
                 () => this.props.isSelected() && MainOverlayTextBox.Instance.SetTextDoc(this.props.Document, this.props.fieldKey, this._ref.current!, this.props.ScreenToLocalTransform));
->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4
         }
 
 
@@ -265,13 +260,7 @@ export class FormattedTextBox extends React.Component<(FieldViewProps & Formatte
     render() {
         let style = this.props.isOverlay ? "scroll" : "hidden";
         return (
-<<<<<<< HEAD
-            <div
-                style={{ overflowY: /*this.props.isSelected() ||*/ this.props.isOverlay ? "scroll" : "hidden" }}
-                className={`formattedTextBox-cont`}
-=======
             <div className={`formattedTextBox-cont-${style}`}
->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4
                 onKeyDown={this.onKeyPress}
                 onKeyPress={this.onKeyPress}
                 onFocus={this.onFocused}
-- 
cgit v1.2.3-70-g09d2

