Resolve conflict with package.json

Signed-off-by: Sean Tan <seant@splunk.com>
2021-08-26 10:31:09 -07:00
parent b129e0214a
commit 0f48596226
1 changed files with 5 additions and 0 deletions
@@ -68,9 +68,14 @@
    "@backstage/cli": "^0.7.9",
 =======
    "aws-sdk-mock": "^5.2.1",
+<<<<<<< HEAD
    "@backstage/backend-test-utils": "^0.1.5",
    "@backstage/cli": "^0.7.8",
 >>>>>>> Finish AwsS3ReadTreeProcessor tests
+=======
+    "@backstage/backend-test-utils": "^0.1.6",
+    "@backstage/cli": "^0.7.9",
+>>>>>>> Resolve conflict with package.json
    "@backstage/test-utils": "^0.1.17",
    "@types/core-js": "^2.5.4",
    "@types/git-url-parse": "^9.0.0",