Merge branch 'master' into PLT-2115

1 files changed, 2 insertions, 24 deletions

diff --git a/web/react/components/channel_view.jsx b/web/react/components/channel_view.jsx
index 9c4131292..76744d6d7 100644
--- a/web/react/components/channel_view.jsx
+++ b/web/react/components/channel_view.jsx
@@ -2,34 +2,11 @@
 // See License.txt for license information.
 
 import CenterPanel from '../components/center_panel.jsx';
-import Sidebar from '../components/sidebar.jsx';
-import SidebarRight from '../components/sidebar_right.jsx';
-import SidebarRightMenu from '../components/sidebar_right_menu.jsx';
 
 export default class ChannelView extends React.Component {
     render() {
         return (
-            <div className='container-fluid'>
-                <div
-                    className='sidebar--right'
-                    id='sidebar-right'
-                >
-                    <SidebarRight/>
-                </div>
-                <div
-                    className='sidebar--menu'
-                    id='sidebar-menu'
-                >
-                    <SidebarRightMenu/>
-                </div>
-                <div
-                    className='sidebar--left'
-                    id='sidebar-left'
-                >
-                    <Sidebar/>
-                </div>
-                <CenterPanel/>
-            </div>
+            <CenterPanel/>
         );
     }
 }
@@ -37,4 +14,5 @@ ChannelView.defaultProps = {
 };
 
 ChannelView.propTypes = {
+    params: React.PropTypes.object
 };