chore: update some packages

Signed-off-by: blam <ben@blam.sh>
2021-07-07 15:53:15 +02:00
parent 271e13d723
commit b60091b117
2 changed files with 6 additions and 0 deletions
@@ -21,6 +21,7 @@
  },
  "dependencies": {
    "@backstage/backend-common": "^0.8.4",
+    "@backstage/plugin-scaffolder-backend": "^0.12.2",
    "@backstage/config": "^0.1.5",
    "@types/express": "^4.17.6",
    "express": "^4.17.1",
@@ -20,8 +20,13 @@
    "clean": "backstage-cli clean"
  },
  "dependencies": {
+<<<<<<< HEAD
    "@backstage/backend-common": "^0.8.6",
    "@backstage/plugin-scaffolder-backend": "^0.14.0",
+=======
+    "@backstage/backend-common": "^0.8.4",
+    "@backstage/plugin-scaffolder-backend": "^0.12.2",
+>>>>>>> chore: update some packages
    "@backstage/config": "^0.1.5",
    "@backstage/errors": "^0.1.1",
    "@backstage/integration": "^0.5.8",