From d399742c152798fbec91cc2ad34ea74fdcb8582c Mon Sep 17 00:00:00 2001 From: Sean Tan Date: Thu, 26 Aug 2021 10:38:09 -0700 Subject: [PATCH] Copy package.json from master and add 'aws-sdk-mock' to devDependencies Signed-off-by: Sean Tan --- plugins/catalog-backend/package.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index 9be4333a35..07b0b09f0f 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -40,6 +40,7 @@ "@octokit/graphql": "^4.5.8", "@types/express": "^4.17.6", "aws-sdk": "^2.840.0", + "aws-sdk-mock": "^5.2.1", "codeowners-utils": "^1.0.2", "core-js": "^3.6.5", "cross-fetch": "^3.0.6", @@ -63,6 +64,7 @@ "yup": "^0.29.3" }, "devDependencies": { +<<<<<<< HEAD <<<<<<< HEAD "@backstage/backend-test-utils": "^0.1.6", "@backstage/cli": "^0.7.9", @@ -73,6 +75,8 @@ "@backstage/cli": "^0.7.8", >>>>>>> Finish AwsS3ReadTreeProcessor tests ======= +======= +>>>>>>> Copy package.json from master and add 'aws-sdk-mock' to devDependencies "@backstage/backend-test-utils": "^0.1.6", "@backstage/cli": "^0.7.9", >>>>>>> Resolve conflict with package.json