From da3eb0066db1b1eac2efd91be5c219b0c0eac816 Mon Sep 17 00:00:00 2001
From: mishimi <michelle@spinpunch.com>
Date: Wed, 7 Oct 2015 06:48:32 -0700
Subject: Deleting carriage return

---
 web/react/components/channel_notifications.jsx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'web/react')

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>
             );
 
-- 
cgit v1.2.3-1-g7c22