summaryrefslogtreecommitdiffstats
path: root/web/react/components/channel_notifications.jsx
diff options
context:
space:
mode:
authormishimi <michelle@spinpunch.com>2015-10-07 06:48:32 -0700
committermishimi <michelle@spinpunch.com>2015-10-07 06:48:32 -0700
commitda3eb0066db1b1eac2efd91be5c219b0c0eac816 (patch)
treea3d191b7cf3932755211924e8ddaab3e788289e0 /web/react/components/channel_notifications.jsx
parent4263c08c55f7bc4b18cadeaed44f9ed8126ba70e (diff)
downloadchat-da3eb0066db1b1eac2efd91be5c219b0c0eac816.tar.gz
chat-da3eb0066db1b1eac2efd91be5c219b0c0eac816.tar.bz2
chat-da3eb0066db1b1eac2efd91be5c219b0c0eac816.zip
Deleting carriage return
Diffstat (limited to 'web/react/components/channel_notifications.jsx')
-rw-r--r--web/react/components/channel_notifications.jsx4
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>
);