merged
This commit is contained in:
parent
db3637259f
commit
497e207c35
|
|
@ -23,11 +23,7 @@
|
|||
"keepalive-for-react": "^2.0.7",
|
||||
"node-schedule": "^2.1.1",
|
||||
"nprogress": "^0.2.0",
|
||||
<<<<<<< HEAD
|
||||
"oak-common-aspect": "~3.0.1",
|
||||
=======
|
||||
"oak-common-aspect": "~3.0.0",
|
||||
>>>>>>> dev
|
||||
"oak-domain": "~5.0.19",
|
||||
"oak-memory-tree-store": "~3.3.1",
|
||||
"ol": "^7.3.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue