merge

3 files changed, 0 insertions, 18 deletions

diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss
index 7bd50b716..4709cbab3 100644
--- a/src/client/views/DocumentDecorations.scss
+++ b/src/client/views/DocumentDecorations.scss
@@ -3,13 +3,9 @@
 .documentDecorations {
     position: absolute;
 }
-<<<<<<< HEAD
 
-#documentDecorations-container {
-=======
 .documentDecorations-container {
     z-index: $docDecorations-zindex;
->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4
     position: absolute;
     top: 0;
     left: 0;
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}
diff --git a/src/server/ServerUtil.ts b/src/server/ServerUtil.ts
index a63fe5447..eb5749dff 100644
--- a/src/server/ServerUtil.ts
+++ b/src/server/ServerUtil.ts
@@ -18,11 +18,8 @@ import { NumberField } from "./../fields/NumberField";
 import { RichTextField } from "./../fields/RichTextField";
 import { TextField } from "./../fields/TextField";
 import { Transferable, Types } from "./Message";
-<<<<<<< HEAD
 import { TemplateField } from "../fields/TemplateField";
-=======
 import { IconField } from "../fields/IconFIeld";
->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4
 
 export class ServerUtils {
     public static prepend(extension: string): string {