chore: fixing merge b0rked

Signed-off-by: blam <ben@blam.sh>

plugins/scaffolder-backend-module-cookiecutter/package.json

@@ -4,7 +4,6 @@
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
-  "private": true,
   "publishConfig": {
     "access": "public",
     "main": "dist/index.cjs.js",
@@ -20,10 +19,10 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.8.4",
+    "@backstage/backend-common": "^0.8.6",
     "@backstage/errors": "^0.1.1",
     "@backstage/integration": "^0.5.7",
-    "@backstage/plugin-scaffolder-backend": "^0.12.2",
+    "@backstage/plugin-scaffolder-backend": "^0.14.0",
     "@backstage/config": "^0.1.5",
     "command-exists": "^1.2.9",
     "fs-extra": "^10.0.0",

plugins/scaffolder-backend-module-rails/package.json

@@ -20,13 +20,8 @@
     "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",