From 0f485962267b32cb072ecb94d7a88a36a36bfa4e Mon Sep 17 00:00:00 2001 From: Sean Tan Date: Thu, 26 Aug 2021 10:31:09 -0700 Subject: [PATCH] Resolve conflict with package.json Signed-off-by: Sean Tan --- plugins/catalog-backend/package.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/catalog-backend/package.json b/plugins/catalog-backend/package.json index 15a7e65570..9be4333a35 100644 --- a/plugins/catalog-backend/package.json +++ b/plugins/catalog-backend/package.json @@ -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",