fixing merge conflicts

1 files changed, 5 insertions, 5 deletions

diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 3aa985863..f70d60e3a 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -61,17 +61,17 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <Navbar teamName={team_name} />,
+        <Navbar teamDisplayName={team_name} />,
         document.getElementById('navbar')
     );
 
     React.render(
-        <Sidebar teamName={team_name} teamType={team_type} />,
+        <Sidebar teamDisplayName={team_name} teamType={team_type} />,
         document.getElementById('sidebar-left')
     );
 
     React.render(
-        <RenameTeamModal teamName={team_name} />,
+        <RenameTeamModal teamDisplayName={team_name} />,
         document.getElementById('rename_team_modal')
     );
 
@@ -91,7 +91,7 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <TeamMembersModal teamName={team_name} />,
+        <TeamMembersModal teamDisplayName={team_name} />,
         document.getElementById('team_members_modal')
     );
 
@@ -186,7 +186,7 @@ global.window.setup_channel_page = function(team_name, team_type, team_id, chann
     );
 
     React.render(
-        <SidebarRightMenu teamName={team_name} teamType={team_type} />,
+        <SidebarRightMenu teamDisplayName={team_name} teamType={team_type} />,
         document.getElementById('sidebar-menu')
     );