Merge branch 'master' into 'master'

Fix build failure See merge request entgra/carbon-device-mgt!639
4 years ago · 01e6cb0522
parent 3e6e55fa1e bbecbb6f8a
commit 01e6cb0522
2 changed files with 2 additions and 1 deletions
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json
@ -17,6 +17,7 @@
    "acorn": "^6.2.0",
    "antd": "^4.0.0",
    "axios": "^0.19.0",
    "babel-eslint": "^10.1.0",
    "d3": "^5.9.7",
    "dagre": "^0.8.4",
    "entgra-icons-react": "^1.0.0",
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json
@ -13,7 +13,7 @@
    "acorn": "^6.2.0",
    "antd": "^4.0.0",
    "axios": "^0.18.1",
-    "babel-eslint": "^9.0.0",
+    "babel-eslint": "^10.1.0",
    "d3": "^5.9.7",
    "dagre": "^0.8.4",
    "imagemin": "^5.3.1",