Update checked-in dependencies

node_modules/.package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.25.12",
+  "version": "2.25.12",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
@@ -800,17 +800,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-<<<<<<< HEAD
       "version": "16.11.22",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-16.11.22.tgz",
       "integrity": "sha512-DYNtJWauMQ9RNpesl4aVothr97/tIJM8HbyOXJ0AYT1Z2bEjLHyfjOBPAQQVMLf8h3kSShYfNk8Wnto8B2zHUA=="
-=======
-      "version": "20.9.0",
-      "license": "MIT",
-      "dependencies": {
-        "undici-types": "~5.26.4"
-      }
->>>>>>> origin/releases/v3
     },
     "node_modules/@types/node-fetch": {
       "version": "2.6.4",
@@ -5589,13 +5581,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-<<<<<<< HEAD
-=======
-    "node_modules/undici-types": {
-      "version": "5.26.5",
-      "license": "MIT"
-    },
->>>>>>> origin/releases/v3
     "node_modules/universal-user-agent": {
       "version": "6.0.0",
       "license": "ISC"