From c8eef5e9265998c2f64911b14784b7ec84a1efc8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Aug 2026 04:29:48 +0000
Subject: [PATCH] deps: bump tailwind-merge from 2.6.1 to 3.6.0 in
 /apps/dashboard

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>
---
 apps/dashboard/package-lock.json | 18 ++++--------------
 apps/dashboard/package.json      |  2 +-
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/apps/dashboard/package-lock.json b/apps/dashboard/package-lock.json
index e7dfda5..f4975c4 100644
--- a/apps/dashboard/package-lock.json
+++ b/apps/dashboard/package-lock.json
@@ -19,7 +19,7 @@
         "react-dom": "^19.2.8",
         "recharts": "^3.10.1",
         "shadcn": "^4.18.0",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^3.6.0",
         "tw-animate-css": "^1.4.0",
         "zustand": "^5.0.15"
       },
@@ -10005,16 +10005,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/shadcn/node_modules/tailwind-merge": {
-      "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"
-      }
-    },
     "node_modules/shadcn/node_modules/tsconfig-paths": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz",
@@ -10590,9 +10580,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.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",
diff --git a/apps/dashboard/package.json b/apps/dashboard/package.json
index 7359f06..e2c751a 100644
--- a/apps/dashboard/package.json
+++ b/apps/dashboard/package.json
@@ -21,7 +21,7 @@
     "react-dom": "^19.2.8",
     "recharts": "^3.10.1",
     "shadcn": "^4.18.0",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.6.0",
     "tw-animate-css": "^1.4.0",
     "zustand": "^5.0.15"
   },