diff options
| author | JoramWilander <jwawilander@gmail.com> | 2015-11-02 15:10:46 -0500 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2015-11-02 15:10:46 -0500 |
| commit | 35b11e0e61fd3c7130c3f54601ba05dd0b52fba3 (patch) | |
| tree | bc35ac95c1012e9e15c989fc895a694bfa971ee4 /web/react/components/channel_view.jsx | |
| parent | 95da41257155e4d1d8201471e7ae1f5d96450189 (diff) | |
| download | chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.tar.gz chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.tar.bz2 chat-35b11e0e61fd3c7130c3f54601ba05dd0b52fba3.zip | |
Fix merge issues
Diffstat (limited to 'web/react/components/channel_view.jsx')
| -rw-r--r-- | web/react/components/channel_view.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/components/channel_view.jsx b/web/react/components/channel_view.jsx index beafa7d63..3f53a94c2 100644 --- a/web/react/components/channel_view.jsx +++ b/web/react/components/channel_view.jsx @@ -1,10 +1,10 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -var CenterPanel = require('../components/center_panel.jsx'); -var Sidebar = require('../components/sidebar.jsx'); -var SidebarRight = require('../components/sidebar_right.jsx'); -var SidebarRightMenu = require('../components/sidebar_right_menu.jsx'); +const CenterPanel = require('../components/center_panel.jsx'); +const Sidebar = require('../components/sidebar.jsx'); +const SidebarRight = require('../components/sidebar_right.jsx'); +const SidebarRightMenu = require('../components/sidebar_right_menu.jsx'); export default class ChannelView extends React.Component { constructor(props) { |