From 11b8f131cd74d9d03383ef0cd39f595a7f9596dd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Apr 2026 01:05:41 +0000
Subject: [PATCH] chore(deps): bump tailwind-merge from 2.6.1 to 3.5.0 in /ui

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.1 to 3.5.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.1...v3.5.0)

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

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

diff --git a/ui/package-lock.json b/ui/package-lock.json
index 54f08b4..02d1f1f 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -49,7 +49,7 @@
         "recharts": "^3.8.1",
         "shiki": "^1.24.0",
         "sonner": "^2.0.7",
-        "tailwind-merge": "^2.5.5",
+        "tailwind-merge": "^3.5.0",
         "vaul": "^1.1.2",
         "zod": "^3.25.76",
         "zustand": "^5.0.2"
@@ -9769,9 +9769,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
-      "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
+      "version": "3.5.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
+      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/ui/package.json b/ui/package.json
index e6a4ef8..0115466 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -55,7 +55,7 @@
     "recharts": "^3.8.1",
     "shiki": "^1.24.0",
     "sonner": "^2.0.7",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^3.5.0",
     "vaul": "^1.1.2",
     "zod": "^3.25.76",
     "zustand": "^5.0.2"