From 8b6969176945af811e949627b84ad30d92c2fc75 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:31:04 +0000
Subject: [PATCH] Update checked-in dependencies

---
 node_modules/.package-lock.json | 2 +-
 package-lock.json               | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 17ce787ba6..bf709e1661 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.25.0",
+  "version": "2.25.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/package-lock.json b/package-lock.json
index ab48f822f2..50a1868eeb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "3.25.0",
+  "version": "2.25.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "3.25.0",
+      "version": "2.25.0",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^1.1.2",
@@ -42,13 +42,8 @@
         "@types/adm-zip": "^0.5.5",
         "@types/get-folder-size": "^2.0.0",
         "@types/js-yaml": "^4.0.9",
-<<<<<<< HEAD
         "@types/node": "16.11.22",
-        "@types/semver": "^7.5.7",
-=======
-        "@types/node": "20.9.0",
         "@types/semver": "^7.5.8",
->>>>>>> origin/releases/v3
         "@types/sinon": "^17.0.3",
         "@typescript-eslint/eslint-plugin": "^7.5.0",
         "@typescript-eslint/parser": "^7.5.0",