From 7db9361b19a3b61ba0f72b67604a14485ee59548 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Sep 2026 11:34:27 +0000
Subject: [PATCH] Bump tailwind-merge from 2.4.0 to 3.7.0 in /web

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge/tree/HEAD/packages/tailwind-merge) from 2.4.0 to 3.7.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/commits/tailwind-merge@3.7.0/packages/tailwind-merge)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-version: 3.7.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 web/package-lock.json | 18 ++++--------------
 web/package.json      |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/web/package-lock.json b/web/package-lock.json
index 3dfcf550ef..77e34086d9 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -76,7 +76,7 @@
         "scroll-into-view-if-needed": "^3.1.0",
         "sonner": "^2.0.8",
         "swr": "^2.5.1",
-        "tailwind-merge": "^2.4.0",
+        "tailwind-merge": "^3.7.0",
         "tailwind-scrollbar": "^3.1.0",
         "tailwindcss-animate": "^1.0.7",
         "use-long-press": "^3.3.0",
@@ -3096,16 +3096,6 @@
         "react": ">=18"
       }
     },
-    "node_modules/@rjsf/shadcn/node_modules/tailwind-merge": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.7.0.tgz",
-      "integrity": "sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/dcastil"
-      }
-    },
     "node_modules/@rjsf/utils": {
       "version": "6.10.0",
       "resolved": "https://registry.npmjs.org/@rjsf/utils/-/utils-6.10.0.tgz",
@@ -10104,9 +10094,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz",
-      "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==",
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.7.0.tgz",
+      "integrity": "sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/web/package.json b/web/package.json
index 3b8a274d0d..98931dd30f 100644
--- a/web/package.json
+++ b/web/package.json
@@ -88,7 +88,7 @@
     "scroll-into-view-if-needed": "^3.1.0",
     "sonner": "^2.0.8",
     "swr": "^2.5.1",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^3.7.0",
     "tailwind-scrollbar": "^3.1.0",
     "tailwindcss-animate": "^1.0.7",
     "use-long-press": "^3.3.0",