From 61ddd48e03173f829faeb3bdfbc157a6dc0b6531 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 22 Mar 2024 10:40:56 +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 55dc16f3d7..758a4d729a 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "3.24.9",
+  "version": "2.24.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/package-lock.json b/package-lock.json
index 0c084488fb..8444171ef2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "3.24.9",
+  "version": "2.24.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "3.24.9",
+      "version": "2.24.9",
       "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.3.0",
         "@typescript-eslint/parser": "^7.3.0",