Merge branch 'master' into PLT-12-log

1 files changed, 0 insertions, 6 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 182721bef..e70b51865 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -17,7 +17,6 @@ var RenameChannelModal = require('../components/rename_channel_modal.jsx');
 var EditPostModal = require('../components/edit_post_modal.jsx');
 var DeletePostModal = require('../components/delete_post_modal.jsx');
 var MoreChannelsModal = require('../components/more_channels.jsx');
-var NewChannelModal = require('../components/new_channel.jsx');
 var PostDeletedModal = require('../components/post_deleted_modal.jsx');
 var ChannelNotificationsModal = require('../components/channel_notifications.jsx');
 var UserSettingsModal = require('../components/user_settings_modal.jsx');
@@ -154,11 +153,6 @@ function setupChannelPage(teamName, teamType, teamId, channelName, channelId) {
     );
 
     React.render(
-        <NewChannelModal />,
-        document.getElementById('new_channel_modal')
-    );
-
-    React.render(
         <PostListContainer />,
         document.getElementById('post-list')
     );