undo bad merge

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/21833/head
Michael Telatynski 2017-10-14 17:14:17 +01:00
parent e79f9ef011
commit b0b7472901
No known key found for this signature in database
GPG Key ID: 3F879DA5AD802A5E
1 changed files with 3 additions and 3 deletions

View File

@ -400,7 +400,7 @@ module.exports = React.createClass({
<form autoComplete="off"> <form autoComplete="off">
<input className="mx_MemberList_query" id="mx_MemberList_query" type="text" <input className="mx_MemberList_query" id="mx_MemberList_query" type="text"
onChange={this.onSearchQueryChanged} value={this.state.searchQuery} onChange={this.onSearchQueryChanged} value={this.state.searchQuery}
placeholder={ _t('Filter room members') } /> placeholder={_t('Filter room members')} />
</form> </form>
); );
@ -413,9 +413,9 @@ module.exports = React.createClass({
getChildren={this._getChildrenJoined} getChildren={this._getChildrenJoined}
getChildCount={this._getChildCountJoined} getChildCount={this._getChildCountJoined}
/> />
{invitedSection} { invitedSection }
</GeminiScrollbar> </GeminiScrollbar>
</div> </div>
); );
} },
}); });