diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-07 10:38:41 -0400 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2015-10-07 10:38:41 -0400 |
| commit | 7daa8680c8b1fc54b035c49219cd68daea0a4cb2 (patch) | |
| tree | 576844a37cd756bb19bc22237de614c67c1a2e4c /web/react/components | |
| parent | 4d600babe8bfb35ab22fc16d64401003e3690187 (diff) | |
| parent | da3eb0066db1b1eac2efd91be5c219b0c0eac816 (diff) | |
| download | chat-7daa8680c8b1fc54b035c49219cd68daea0a4cb2.tar.gz chat-7daa8680c8b1fc54b035c49219cd68daea0a4cb2.tar.bz2 chat-7daa8680c8b1fc54b035c49219cd68daea0a4cb2.zip | |
Merge pull request #956 from mishimi/patch-8
Deleting carriage return
Diffstat (limited to 'web/react/components')
| -rw-r--r-- | web/react/components/channel_notifications.jsx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/web/react/components/channel_notifications.jsx b/web/react/components/channel_notifications.jsx index fed8e789e..ed76b7bce 100644 --- a/web/react/components/channel_notifications.jsx +++ b/web/react/components/channel_notifications.jsx @@ -195,9 +195,7 @@ export default class ChannelNotifications extends React.Component { const extraInfo = ( <span> - {'Selecting an option other than "Default" will override the global notification settings.'} - <br/> - {'Desktop notifications are available on Firefox, Safari, and Chrome.'} + {'Selecting an option other than "Default" will override the global notification settings. Desktop notifications are available on Firefox, Safari, and Chrome.'} </span> ); |