summaryrefslogtreecommitdiffstats
path: root/web/react/components/navbar.jsx
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-12-08 13:02:33 -0800
committer=Corey Hulen <corey@hulen.com>2015-12-08 13:02:33 -0800
commit69ecfe4cb1763b10f1690b543ee1828aed94aefa (patch)
tree53c70c2984b2e4144d3cc0e539ef1b52b8eb4552 /web/react/components/navbar.jsx
parent8b29404525f036633be6b25dc18c536d2aafee02 (diff)
parent90791dd98ea0f26439a13c1ec05a610514988b5c (diff)
downloadchat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.gz
chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.tar.bz2
chat-69ecfe4cb1763b10f1690b543ee1828aed94aefa.zip
Fixing merge
Diffstat (limited to 'web/react/components/navbar.jsx')
-rw-r--r--web/react/components/navbar.jsx2
1 files changed, 0 insertions, 2 deletions
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 3bdc9efac..ae14fca2f 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -272,7 +272,6 @@ export default class Navbar extends React.Component {
href='#'
className='dropdown-toggle theme'
type='button'
- id='channel_header_dropdown'
data-toggle='dropdown'
aria-expanded='true'
>
@@ -282,7 +281,6 @@ export default class Navbar extends React.Component {
<ul
className='dropdown-menu'
role='menu'
- aria-labelledby='channel_header_dropdown'
>
{viewInfoOption}
{addMembersOption}