From ca45cc0f92e0c85c45229d6ad4a2599d890f2268 Mon Sep 17 00:00:00 2001
From: Matt Lord <mattalord@gmail.com>
Date: Fri, 13 Sep 2024 20:03:54 -0400
Subject: [PATCH] Fix conflicts

Signed-off-by: Matt Lord <mattalord@gmail.com>
---
 web/vtadmin/package-lock.json | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json
index 92a82594b62..c070d903b3c 100644
--- a/web/vtadmin/package-lock.json
+++ b/web/vtadmin/package-lock.json
@@ -15539,7 +15539,6 @@
         "node": ">= 0.6"
       }
     },
-<<<<<<< HEAD
     "node_modules/serve-handler/node_modules/minimatch": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -15551,13 +15550,12 @@
       "engines": {
         "node": "*"
       }
-=======
+    },
     "node_modules/serve-handler/node_modules/path-to-regexp": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",
       "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==",
       "dev": true
->>>>>>> 03af0cd001 (VTAdmin: Fix serve-handler's path-to-regexp dep and add default schema refresh (#16778))
     },
     "node_modules/serve/node_modules/ajv": {
       "version": "8.12.0",
@@ -27025,8 +27023,7 @@
     "path-to-regexp": {
       "version": "8.1.0",
       "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.1.0.tgz",
-      "integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ==",
-      "dev": true
+      "integrity": "sha512-Bqn3vc8CMHty6zuD+tG23s6v2kwxslHEhTj4eYaVKGIEB+YX/2wd0/rgXLFD9G9id9KCtbVy/3ZgmvZjpa0UdQ=="
     },
     "path-type": {
       "version": "4.0.0",
@@ -28260,7 +28257,7 @@
         "mime-types": "2.1.18",
         "minimatch": "3.1.2",
         "path-is-inside": "1.0.2",
-        "path-to-regexp": "^8.0.0",
+        "path-to-regexp": "^3.3.0",
         "range-parser": "1.2.0"
       },
       "dependencies": {
@@ -28297,6 +28294,12 @@
           "requires": {
             "brace-expansion": "^1.1.7"
           }
+        },
+        "path-to-regexp": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-3.3.0.tgz",
+          "integrity": "sha512-qyCH421YQPS2WFDxDjftfc1ZR5WKQzVzqsp4n9M2kQhVOo/ByahFoUNJfl58kOcEGfQ//7weFTDhm+ss8Ecxgw==",
+          "dev": true
         }
       }
     },