ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-13 12:48:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Time Conductor] Resolved merge conflicts

Browse Source
This commit is contained in:
Henry
2016-09-12 14:54:16 -07:00
parent 9a06325533
commit d1960b2f46
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.js
View File

@ -91,14 +91,6 @@ define([
'./platform/features/pages/bundle', './platform/features/pages/bundle',
'./platform/features/plot/bundle', './platform/features/plot/bundle',
'./platform/features/timeline/bundle', './platform/features/timeline/bundle',
// Old time conductor
//'./platform/features/conductor/bundle',
// New time conductor
//'./platform/features/conductor-v2/conductor/bundle',
//'./platform/features/conductor-v2/compatibility/bundle',
//'./platform/features/conductor-v2/utcTimeSystem/bundle',
'./platform/features/table/bundle', './platform/features/table/bundle',
'./platform/forms/bundle', './platform/forms/bundle',
'./platform/identity/bundle', './platform/identity/bundle',
@ -110,8 +102,6 @@ define([
'./platform/search/bundle', './platform/search/bundle',
'./platform/status/bundle', './platform/status/bundle',
'./platform/commonUI/regions/bundle' './platform/commonUI/regions/bundle'
], function (Main, legacyRegistry) { ], function (Main, legacyRegistry) {
return { return {
legacyRegistry: legacyRegistry, legacyRegistry: legacyRegistry,