From e89387d7b79b1b217766321e890fde20c8415734 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 15:19:51 -0800
Subject: [PATCH] Bump tailwind-merge from 2.0.0 to 2.1.0 in /frontend (#727)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 16 ++++++++--------
 frontend/package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fd1229c0f4..88d1fa7173 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -49,7 +49,7 @@
         "react-virtualized-auto-sizer": "^1.0.20",
         "react-window": "^1.8.10",
         "swr": "^2.2.4",
-        "tailwind-merge": "^2.0.0",
+        "tailwind-merge": "^2.1.0",
         "tailwindcss-animate": "^1.0.7",
         "use-resize-observer": "^9.1.0",
         "usehooks-ts": "^2.9.1",
@@ -271,9 +271,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.23.2",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.2.tgz",
-      "integrity": "sha512-mM8eg4yl5D6i3lu2QKPuPH4FArvJ8KhTofbE7jwMUv9KX5mBvwPAqnV3MlyBNqdp9RyRKP6Yck8TrfYrPvX3bg==",
+      "version": "7.23.5",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.5.tgz",
+      "integrity": "sha512-NdUTHcPe4C99WxPub+K9l9tK5/lV4UXIoaHSYgzco9BCyjKAAwzdBI+wWtYqHt7LJdbo74ZjRPJgzVweq1sz0w==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -7911,11 +7911,11 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.0.0.tgz",
-      "integrity": "sha512-WO8qghn9yhsldLSg80au+3/gY9E4hFxIvQ3qOmlpXnqpDKoMruKfi/56BbbMg6fHTQJ9QD3cc79PoWqlaQE4rw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.1.0.tgz",
+      "integrity": "sha512-l11VvI4nSwW7MtLSLYT4ldidDEUwQAMWuSHk7l4zcXZDgnCRa0V3OdCwFfM7DCzakVXMNRwAeje9maFFXT71dQ==",
       "dependencies": {
-        "@babel/runtime": "^7.23.1"
+        "@babel/runtime": "^7.23.5"
       },
       "funding": {
         "type": "github",
diff --git a/frontend/package.json b/frontend/package.json
index 7912d6e80e..bb721a499a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -56,7 +56,7 @@
     "react-virtualized-auto-sizer": "^1.0.20",
     "react-window": "^1.8.10",
     "swr": "^2.2.4",
-    "tailwind-merge": "^2.0.0",
+    "tailwind-merge": "^2.1.0",
     "tailwindcss-animate": "^1.0.7",
     "use-resize-observer": "^9.1.0",
     "usehooks-ts": "^2.9.1",