chore(NA): merge and solve conflicts with 6.7 (#32390)

elastic · Mar 4, 2019 · cc8a0f3 · cc8a0f3
1 parent e768a2e
commit cc8a0f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/src/legacy/core_plugins/status_page/public/status_page.js b/src/legacy/core_plugins/status_page/public/status_page.js
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-import 'ui/autoload/modules';
 import 'ui/autoload/styles';
 import 'ui/i18n';
 import { uiModules } from 'ui/modules';

diff --git a/src/ui/public/chrome/chrome.js b/src/ui/public/chrome/chrome.js
@@ -30,6 +30,7 @@ import '../storage';
 import '../directives/kbn_src';
 import '../watch_multi';
 import './services';
+import '../react_components';
 
 import { initAngularApi } from './api/angular';
 import appsApi from './api/apps';