From f2e266ddb5ec6f8afbe316ab17dc5e8d705a50a7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Jul 2026 19:26:34 +0000
Subject: [PATCH] chore(deps): Bump tailwind-merge from 2.6.1 to 3.6.0 in
 /frontend

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

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

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

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index fd03372..be76335 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -23,7 +23,7 @@
         "next": "^15.5.21",
         "react": "^19.2.8",
         "react-dom": "^19.2.8",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^3.6.0",
         "y-protocols": "^1.0.7",
         "yjs": "^13.6.31",
         "zustand": "^5.0.2"
@@ -9269,9 +9269,10 @@
       "dev": true
     },
     "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.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz",
+      "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
diff --git a/frontend/package.json b/frontend/package.json
index 81ce4a8..0522c03 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -26,7 +26,7 @@
     "next": "^15.5.21",
     "react": "^19.2.8",
     "react-dom": "^19.2.8",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.6.0",
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.31",
     "zustand": "^5.0.2"