Fixing merge

web/react/components/team_settings_modal.jsx

@@ -36,7 +36,9 @@ export default class TeamSettingsModal extends React.Component {
         const tabs = [];
         tabs.push({name: 'general', uiName: 'General', icon: 'glyphicon glyphicon-cog'});
         tabs.push({name: 'import', uiName: 'Import', icon: 'glyphicon glyphicon-upload'});
-        tabs.push({name: 'export', uiName: 'Export', icon: 'glyphicon glyphicon-download'});
+
+        // To enable export uncomment this line
+        //tabs.push({name: 'export', uiName: 'Export', icon: 'glyphicon glyphicon-download'});
 
         return (
             <div