From fbab93d8c86cccaa76a9c82bc6b282eb3bf69e3b Mon Sep 17 00:00:00 2001 From: Henry Mercer Date: Fri, 19 Aug 2022 11:04:36 +0100 Subject: [PATCH] Resolve merge conflicts --- package-lock.json | 6 ------ package.json | 6 ------ 2 files changed, 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 589699040..79bafe776 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,13 +44,7 @@ "@types/adm-zip": "^0.5.0", "@types/get-folder-size": "^2.0.0", "@types/js-yaml": "^4.0.5", -<<<<<<< HEAD - "@types/long": "4.0.1", "@types/node": "12.12", -======= - "@types/long": "5.0.0", - "@types/node": "16.11.22", ->>>>>>> origin/releases/v2 "@types/semver": "^7.3.8", "@types/sinon": "^10.0.2", "@typescript-eslint/parser": "^5.0.0", diff --git a/package.json b/package.json index 5e3c1a18a..884ba6942 100644 --- a/package.json +++ b/package.json @@ -59,13 +59,7 @@ "@types/adm-zip": "^0.5.0", "@types/get-folder-size": "^2.0.0", "@types/js-yaml": "^4.0.5", -<<<<<<< HEAD - "@types/long": "4.0.1", "@types/node": "12.12", -======= - "@types/long": "5.0.0", - "@types/node": "16.11.22", ->>>>>>> origin/releases/v2 "@types/semver": "^7.3.8", "@types/sinon": "^10.0.2", "@typescript-eslint/parser": "^5.0.0",