From 9d5cf5ea03a13d78e154908d49382a3bdca54406 Mon Sep 17 00:00:00 2001
From: Louis Lam <louislam@users.noreply.github.com>
Date: Mon, 9 Oct 2023 21:40:18 +0800
Subject: [PATCH] Fix merge conflict

---
 package-lock.json | 55 +++--------------------------------------------
 1 file changed, 3 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 988b4e8f4..8a6fb593d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -87,7 +87,6 @@
                 "@fortawesome/vue-fontawesome": "~3.0.0-5",
                 "@popperjs/core": "~2.10.2",
                 "@types/bootstrap": "~5.1.9",
-                "@vitejs/plugin-legacy": "~4.1.0",
                 "@vitejs/plugin-vue": "~4.2.3",
                 "@vue/compiler-sfc": "~3.3.4",
                 "@vuepic/vue-datepicker": "~3.4.8",
@@ -2802,12 +2801,6 @@
                 "node": ">=6.9.0"
             }
         },
-        "node_modules/@babel/runtime/node_modules/regenerator-runtime": {
-            "version": "0.14.0",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
-            "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
-            "dev": true
-        },
         "node_modules/@babel/template": {
             "version": "7.22.15",
             "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
@@ -5865,42 +5858,6 @@
                 "@types/node": "*"
             }
         },
-        "node_modules/@vitejs/plugin-legacy": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-legacy/-/plugin-legacy-4.1.1.tgz",
-            "integrity": "sha512-um3gbVouD2Q/g19C0qpDfHwveXDCAHzs8OC3e9g6aXpKoD1H14himgs7wkMnhAynBJy7QqUoZNAXDuqN8zLR2g==",
-            "dev": true,
-            "dependencies": {
-                "@babel/core": "^7.22.9",
-                "@babel/preset-env": "^7.22.9",
-                "browserslist": "^4.21.9",
-                "core-js": "^3.31.1",
-                "magic-string": "^0.30.1",
-                "regenerator-runtime": "^0.13.11",
-                "systemjs": "^6.14.1"
-            },
-            "engines": {
-                "node": "^14.18.0 || >=16.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/vitejs/vite?sponsor=1"
-            },
-            "peerDependencies": {
-                "terser": "^5.4.0",
-                "vite": "^4.0.0"
-            }
-        },
-        "node_modules/@vitejs/plugin-legacy/node_modules/core-js": {
-            "version": "3.33.0",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.33.0.tgz",
-            "integrity": "sha512-HoZr92+ZjFEKar5HS6MC776gYslNOKHt75mEBKWKnPeFDpZ6nH5OeF3S6HFT1mUAUZKrzkez05VboaX8myjSuw==",
-            "dev": true,
-            "hasInstallScript": true,
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/core-js"
-            }
-        },
         "node_modules/@vitejs/plugin-vue": {
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.2.3.tgz",
@@ -16470,9 +16427,9 @@
             }
         },
         "node_modules/regenerator-runtime": {
-            "version": "0.13.11",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz",
-            "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==",
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+            "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==",
             "dev": true
         },
         "node_modules/regenerator-transform": {
@@ -17917,12 +17874,6 @@
             "integrity": "sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==",
             "dev": true
         },
-        "node_modules/systemjs": {
-            "version": "6.14.2",
-            "resolved": "https://registry.npmjs.org/systemjs/-/systemjs-6.14.2.tgz",
-            "integrity": "sha512-1TlOwvKWdXxAY9vba+huLu99zrQURDWA8pUTYsRIYDZYQbGyK+pyEP4h4dlySsqo7ozyJBmYD20F+iUHhAltEg==",
-            "dev": true
-        },
         "node_modules/table": {
             "version": "6.8.1",
             "resolved": "https://registry.npmjs.org/table/-/table-6.8.1.tgz",