ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-03-23 20:45:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed another minor merge conflict

Browse Source
This commit is contained in:
Joel McKinnon 2019-12-16 16:55:26 -08:00
parent fbcafe0f62
commit c1d58bb25f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/plugins.js
View File

@ -47,7 +47,7 @@ define([
'./goToOriginalAction/plugin',
'./clearData/plugin',
'./webPage/plugin',
'./condition/plugin'
'./condition/plugin',
'./themes/espresso',
'./themes/maelstrom',
'./themes/snow'
@ -78,7 +78,7 @@ define([
GoToOriginalAction,
ClearData,
WebPagePlugin,
ConditionPlugin
ConditionPlugin,
Espresso,
Maelstrom,
Snow