From d6191e3921e41bcb0c234279bbb0aecfb8dd1b70 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 18 Mar 2026 17:57:50 +0000
Subject: [PATCH] Bump tailwind-merge from 2.6.1 to 3.5.0 in /frontend

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>
---
 frontend/package-lock.json | 8 ++++----
 frontend/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7dba963..72d7005 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -38,7 +38,7 @@
         "react-pdf": "^10.4.1",
         "react-router-dom": "^6.26.0",
         "recharts": "^2.12.7",
-        "tailwind-merge": "^2.5.2",
+        "tailwind-merge": "^3.5.0",
         "zod": "^3.23.8",
         "zustand": "^5.0.0"
       },
@@ -6170,9 +6170,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/frontend/package.json b/frontend/package.json
index 91001d2..7e9ed7c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -40,7 +40,7 @@
     "react-pdf": "^10.4.1",
     "react-router-dom": "^6.26.0",
     "recharts": "^2.12.7",
-    "tailwind-merge": "^2.5.2",
+    "tailwind-merge": "^3.5.0",
     "zod": "^3.23.8",
     "zustand": "^5.0.0"
   },