From 35b11e0e61fd3c7130c3f54601ba05dd0b52fba3 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Mon, 2 Nov 2015 15:10:46 -0500
Subject: Fix merge issues

---
 web/react/components/sidebar_header.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/components/sidebar_header.jsx')

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.'}
-- 
cgit v1.2.3-1-g7c22

