Upgrading client dependancies. Upgrading to babel 6. Moving to es6 package system.

1 files changed, 8 insertions, 8 deletions

diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index b363f0673..b3ec7ddd7 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SettingItemMin = require('../setting_item_min.jsx');
-const SettingItemMax = require('../setting_item_max.jsx');
-const SettingPicture = require('../setting_picture.jsx');
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
+import SettingPicture from '../setting_picture.jsx';
 
-const UserStore = require('../../stores/user_store.jsx');
-const ErrorStore = require('../../stores/error_store.jsx');
+import UserStore from '../../stores/user_store.jsx';
+import ErrorStore from '../../stores/error_store.jsx';
 
-const Client = require('../../utils/client.jsx');
-const AsyncClient = require('../../utils/async_client.jsx');
-const Utils = require('../../utils/utils.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 export default class UserSettingsGeneralTab extends React.Component {
     constructor(props) {