Resolved conflicts

Signed-off-by: Matto <muhamadto@gmail.com>
2021-10-29 15:11:54 +11:00
parent e7f4718b40
commit 5cce78f968
7 changed files with 61 additions and 88 deletions
@@ -29,14 +29,10 @@
  },
  "dependencies": {
    "@backstage/cli-common": "^0.1.4",
-    "@babel/core": "^7.4.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.4.4",
-    "@backstage/integration": "^0.6.5",
    "@backstage/config": "^0.1.10",
    "@backstage/config-loader": "^0.7.0",
    "@backstage/errors": "^0.1.3",
    "@backstage/types": "^0.1.1",
-    "@backstage/config-loader": "^0.6.8",
    "@hot-loader/react-dom": "^16.13.0",
    "@lerna/package-graph": "^4.0.0",
    "@lerna/project": "^4.0.0",