diff --git a/package-lock.json b/package-lock.json index 1214b234e..1319bed65 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38687,7 +38687,6 @@ } }, "serialize-javascript": { -<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", @@ -38695,9 +38694,6 @@ "requires": { "randombytes": "^2.1.0" } -======= - "version": "^3.1.0" ->>>>>>> edaae8f (feat: TT-430 tests added and environment production enabled) }, "ssri": { "version": "8.0.1", @@ -54009,16 +54005,6 @@ } } }, -<<<<<<< HEAD -======= - "serialize-javascript": { - "version": "^3.1.0", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } - }, ->>>>>>> edaae8f (feat: TT-430 tests added and environment production enabled) "serve-index": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", @@ -55877,13 +55863,9 @@ } }, "serialize-javascript": { -<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", -======= - "version": "^3.1.0", ->>>>>>> edaae8f (feat: TT-430 tests added and environment production enabled) "dev": true, "requires": { "randombytes": "^2.1.0" @@ -57095,14 +57077,9 @@ } }, "serialize-javascript": { -<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", -======= - "version": "^3.1.0", - "dev": true, ->>>>>>> edaae8f (feat: TT-430 tests added and environment production enabled) "requires": { "randombytes": "^2.1.0" } @@ -57142,7 +57119,6 @@ }, "dependencies": { "serialize-javascript": { -<<<<<<< HEAD "version": "3.1.0", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz", "integrity": "sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==", @@ -57150,9 +57126,6 @@ "requires": { "randombytes": "^2.1.0" } -======= - "version": "^3.1.0" ->>>>>>> edaae8f (feat: TT-430 tests added and environment production enabled) } } },