From bfb837aa2d2cad007210a119c125746f94e98bba Mon Sep 17 00:00:00 2001 From: Matt Lord Date: Fri, 13 Sep 2024 19:52:43 -0400 Subject: [PATCH] Fix conflict Signed-off-by: Matt Lord --- web/vtadmin/package-lock.json | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/web/vtadmin/package-lock.json b/web/vtadmin/package-lock.json index d67fd51afc7..4909930b67f 100644 --- a/web/vtadmin/package-lock.json +++ b/web/vtadmin/package-lock.json @@ -15724,25 +15724,11 @@ "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", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, - "dependencies": { - "brace-expansion": "^1.1.7" - }, - "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",