From d95215f69164ba5a7ef31edfe9d5c0a852e6c109 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 12:22:19 +0000
Subject: [PATCH] Revert "Update checked-in dependencies"

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

diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index 1123d2d5c..7e10b9d97 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "codeql",
-  "version": "2.24.10",
+  "version": "3.24.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
diff --git a/package-lock.json b/package-lock.json
index 725cffa69..710a49daa 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "codeql",
-  "version": "2.24.10",
+  "version": "3.24.10",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "codeql",
-      "version": "2.24.10",
+      "version": "3.24.10",
       "license": "MIT",
       "dependencies": {
         "@actions/artifact": "^1.1.2",
@@ -42,8 +42,13 @@
         "@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.4.0",
         "@typescript-eslint/parser": "^7.4.0",