summaryrefslogtreecommitdiffstats
path: root/web/react
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-10-12 11:48:52 -0700
committerCorey Hulen <corey@hulen.com>2015-10-12 11:48:52 -0700
commit5ec92975ca3cd2146dc488b4573d117bc4da0a16 (patch)
tree5d19be084cb1c070849407c3656831603fb222b1 /web/react
parent025ca3c1a608edceb84037109aa2c222ec7ab604 (diff)
parent4949b6837f1a2ef103f58659c7692f01378128f7 (diff)
downloadchat-5ec92975ca3cd2146dc488b4573d117bc4da0a16.tar.gz
chat-5ec92975ca3cd2146dc488b4573d117bc4da0a16.tar.bz2
chat-5ec92975ca3cd2146dc488b4573d117bc4da0a16.zip
Merge pull request #989 from mattermost/typos
Fixed typos
Diffstat (limited to 'web/react')
-rw-r--r--web/react/components/user_settings/user_settings_general.jsx3
1 files changed, 1 insertions, 2 deletions
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index c23c61948..66d83725c 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -368,8 +368,7 @@ export default class UserSettingsGeneralTab extends React.Component {
const extraInfo = (
<span>
- {'Use Nickname for a name you might be called that is different from your first name and user name.'}
- {'This is most often used when two or more people have similar sounding names and usernames.'}
+ {'Use Nickname for a name you might be called that is different from your first name and username. This is most often used when two or more people have similar sounding names and usernames.'}
</span>
);