From b893887707079ac23e2312a59ad7edf846a718e9 Mon Sep 17 00:00:00 2001
From: Richard Lewis <rick@matrix.org>
Date: Mon, 12 Jun 2017 14:52:41 +0100
Subject: [PATCH] Fix merge conflict

---
 src/components/views/rooms/MessageComposer.js | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/components/views/rooms/MessageComposer.js b/src/components/views/rooms/MessageComposer.js
index 0f9ec5cd4e..c4e13a5fe6 100644
--- a/src/components/views/rooms/MessageComposer.js
+++ b/src/components/views/rooms/MessageComposer.js
@@ -354,26 +354,21 @@ export default class MessageComposer extends React.Component {
         } else {
             controls.push(
                 <div key="controls_error" className="mx_MessageComposer_noperm_error">
-<<<<<<< HEAD
-                    You do not have permission to post to this room
-                </div>,
-=======
                     { _t('You do not have permission to post to this room') }
-                </div>
->>>>>>> 31f1e421f226bd471b68cdf1f69a8e049a443e5d
+                </div>,
             );
         }
 
-        // let autoComplete;
-        // if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) {
-        //     autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper">
-        //         <Autocomplete
-        //             ref="autocomplete"
-        //             onConfirm={this._onAutocompleteConfirm}
-        //             query={this.state.autocompleteQuery}
-        //             selection={this.state.selection} />
-        //     </div>;
-        // }
+        let autoComplete;
+        if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) {
+            autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper">
+                <Autocomplete
+                    ref="autocomplete"
+                    onConfirm={this._onAutocompleteConfirm}
+                    query={this.state.autocompleteQuery}
+                    selection={this.state.selection} />
+            </div>;
+        }
 
 
         const {style, blockType} = this.state.inputState;