diff --git a/package-lock.json b/package-lock.json index 860a438..4b3435e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,7 +4,10 @@ "lockfileVersion": 1, "requires": true, <<<<<<< HEAD +<<<<<<< HEAD ======= +======= +>>>>>>> faaeb73 (Adjusted package lock) "packages": { "": { "name": "qualiteer", @@ -6280,7 +6283,12 @@ } } }, +<<<<<<< HEAD >>>>>>> f486d50 (Minor Adjustments) +======= +======= +>>>>>>> 1241512 (Adjusted package lock) +>>>>>>> faaeb73 (Adjusted package lock) "dependencies": { "@acuminous/bitsyntax": { "version": "0.1.2", @@ -9741,6 +9749,10 @@ "requires": { "amqplib": "^0.10.3" <<<<<<< HEAD +<<<<<<< HEAD +======= +======= +>>>>>>> faaeb73 (Adjusted package lock) }, "dependencies": { "amqplib": { @@ -9755,8 +9767,12 @@ "url-parse": "~1.5.10" } } +<<<<<<< HEAD ======= >>>>>>> f486d50 (Minor Adjustments) +======= +>>>>>>> 1241512 (Adjusted package lock) +>>>>>>> faaeb73 (Adjusted package lock) } }, "randombytes": {