matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-08 21:42:24 +03:00
Code Activity

Fix merge conflict

Browse Source
This commit is contained in:
Stefan Parviainen
2017-10-02 17:57:22 +02:00
parent 35cb52febc 8d189cc322
commit a96169e80e
74 changed files with 506 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/autocomplete/CommandProvider.js
View File

@@ -129,7 +129,7 @@ export default class CommandProvider extends AutocompleteProvider {
component: (<TextualCompletion
title={result.command}
subtitle={result.args}
description={ _t(result.description) }
description={_t(result.description)}
/>),
range,
};
@@ -150,7 +150,7 @@ export default class CommandProvider extends AutocompleteProvider {
renderCompletions(completions: [React.Component]): ?React.Component {
return <div className="mx_Autocomplete_Completion_container_block">
{completions}
{ completions }
</div>;
}
}