From 828a017a9a879ed16f2c4b2164dab1203ab0f5a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 30 Aug 2026 23:56:03 +0000
Subject: [PATCH] Bump tailwind-merge from 2.6.1 to 3.6.0

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

diff --git a/package-lock.json b/package-lock.json
index 5613ef3..cc8fb0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,7 +27,7 @@
         "eslint-plugin-astro": "^3.1.0",
         "postcss": "^8.5.26",
         "sharp": "^0.35.4",
-        "tailwind-merge": "^2.6.1",
+        "tailwind-merge": "^3.6.0",
         "tailwindcss": "^3.4.19",
         "typescript": "^6.0.3",
         "yaml": "^2.8.3"
@@ -11899,9 +11899,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/package.json b/package.json
index fc6a3ff..ee74a27 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "eslint-plugin-astro": "^3.1.0",
     "postcss": "^8.5.26",
     "sharp": "^0.35.4",
-    "tailwind-merge": "^2.6.1",
+    "tailwind-merge": "^3.6.0",
     "tailwindcss": "^3.4.19",
     "typescript": "^6.0.3",
     "yaml": "^2.8.3"