github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-25 10:23:14 -04:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Tiago Costa 2019-03-04 14:51:48 +00:00 • committed by GitHub
parent e768a2eed9
commit cc8a0f3af7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/legacy/core_plugins/status_page/public/status_page.js
View file

@ -17,7 +17,6 @@
* under the License. * under the License.
*/ */
import 'ui/autoload/modules';
import 'ui/autoload/styles'; import 'ui/autoload/styles';
import 'ui/i18n'; import 'ui/i18n';
import { uiModules } from 'ui/modules'; import { uiModules } from 'ui/modules';

1
src/ui/public/chrome/chrome.js
View file

@ -30,6 +30,7 @@ import '../storage';
import '../directives/kbn_src'; import '../directives/kbn_src';
import '../watch_multi'; import '../watch_multi';
import './services'; import './services';
import '../react_components';
import { initAngularApi } from './api/angular'; import { initAngularApi } from './api/angular';
import appsApi from './api/apps'; import appsApi from './api/apps';