From aec0a87ee1a3980184f4fa4d069911da269432fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 18 May 2026 00:48:35 +0000
Subject: [PATCH] chore(deps)(deps): bump tailwind-merge in /backend/admin

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

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

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

diff --git a/backend/admin/package-lock.json b/backend/admin/package-lock.json
index 1ce4fdc..5980824 100644
--- a/backend/admin/package-lock.json
+++ b/backend/admin/package-lock.json
@@ -46,7 +46,7 @@
         "recharts": "^3.7.0",
         "remark-gfm": "^4.0.1",
         "swr": "^2.4.0",
-        "tailwind-merge": "^3.5.0",
+        "tailwind-merge": "^3.6.0",
         "tailwindcss-animate": "^1.0.7",
         "vaul": "^1.1.2",
         "zod": "^4.3.6"
@@ -10528,9 +10528,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmmirror.com/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
-      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
+      "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/backend/admin/package.json b/backend/admin/package.json
index 3bc59d5..6623c36 100644
--- a/backend/admin/package.json
+++ b/backend/admin/package.json
@@ -47,7 +47,7 @@
     "recharts": "^3.7.0",
     "remark-gfm": "^4.0.1",
     "swr": "^2.4.0",
-    "tailwind-merge": "^3.5.0",
+    "tailwind-merge": "^3.6.0",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^1.1.2",
     "zod": "^4.3.6"