diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-11-02 15:10:46 -0500 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-11-02 15:10:46 -0500 |
| commit | 35b11e0e61fd3c7130c3f54601ba05dd0b52fba3 (patch) | |
| tree | bc35ac95c1012e9e15c989fc895a694bfa971ee4 /web/react/components/sidebar_header.jsx | |
| parent | 95da41257155e4d1d8201471e7ae1f5d96450189 (diff) | |
| download | chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.tar.gz chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.tar.bz2 chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.zip | |
Fix merge issues
Diffstat (limited to 'web/react/components/sidebar_header.jsx')
| -rw-r--r-- | web/react/components/sidebar_header.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx index 949c82a3b..3f777d93c 100644 --- a/web/react/components/sidebar_header.jsx +++ b/web/react/components/sidebar_header.jsx @@ -57,7 +57,7 @@ export default class SidebarHeader extends React.Component { <strong>{'Invite New Members'}</strong> {', access your '} <strong>{'Account Settings'}</strong> - {', and set your '}<strong>{'Theme Color'}</strong>{'.'} + {' and set your '}<strong>{'Theme Color'}</strong>{'.'} </p> <p> {'Team administrators can also access their '}<strong>{'Team Settings'}</strong>{' from this menu.'} |