Copy package.json from master and add 'aws-sdk-mock' to devDependencies

Signed-off-by: Sean Tan <seant@splunk.com>
2021-08-26 10:38:09 -07:00
parent 0f48596226
commit d399742c15
1 changed files with 4 additions and 0 deletions
@@ -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