OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix merge conflict

pull/21833/head
Richard Lewis 2017-06-12 14:52:41 +01:00
parent f9f924bbd6
commit b893887707
1 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/components/views/rooms/MessageComposer.js
View File

@ -354,26 +354,21 @@ export default class MessageComposer extends React.Component {
} else { } else {
controls.push( controls.push(
<div key="controls_error" className="mx_MessageComposer_noperm_error"> <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') } { _t('You do not have permission to post to this room') }
</div> </div>,
>>>>>>> 31f1e421f226bd471b68cdf1f69a8e049a443e5d
); );
} }
// let autoComplete; let autoComplete;
// if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) { if (UserSettingsStore.isFeatureEnabled('rich_text_editor')) {
// autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper"> autoComplete = <div className="mx_MessageComposer_autocomplete_wrapper">
// <Autocomplete <Autocomplete
// ref="autocomplete" ref="autocomplete"
// onConfirm={this._onAutocompleteConfirm} onConfirm={this._onAutocompleteConfirm}
// query={this.state.autocompleteQuery} query={this.state.autocompleteQuery}
// selection={this.state.selection} /> selection={this.state.selection} />
// </div>; </div>;
// } }
const {style, blockType} = this.state.inputState; const {style, blockType} = this.state.inputState;