From 06f80af356e000b0f378178e7f0b7eb7042c4791 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Jan 2025 12:00:49 +0100
Subject: [PATCH] build(deps): bump tailwind-merge from 2.5.4 to 2.6.0 (#495)

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.5.4 to 2.6.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.5.4...v2.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 packages/zudoku/package.json |  2 +-
 pnpm-lock.yaml               | 19 +++++++------------
 website/package.json         |  2 +-
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/zudoku/package.json b/packages/zudoku/package.json
index 0a27de6a..56edc510 100644
--- a/packages/zudoku/package.json
+++ b/packages/zudoku/package.json
@@ -241,7 +241,7 @@
     "sitemap": "8.0.0",
     "spin-delay": "2.0.1",
     "strip-ansi": "7.1.0",
-    "tailwind-merge": "2.5.5",
+    "tailwind-merge": "2.6.0",
     "tailwindcss": "3.4.16",
     "tsx": "^4.19.2",
     "ulidx": "2.4.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f953b1fa..7e9e50e4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -588,8 +588,8 @@ importers:
         specifier: 7.1.0
         version: 7.1.0
       tailwind-merge:
-        specifier: 2.5.5
-        version: 2.5.5
+        specifier: 2.6.0
+        version: 2.6.0
       tailwindcss:
         specifier: 3.4.16
         version: 3.4.16(ts-node@10.9.1(@swc/core@1.10.1(@swc/helpers@0.5.13))(@types/node@20.16.11)(typescript@5.7.2))
@@ -737,8 +737,8 @@ importers:
         specifier: 0.33.5
         version: 0.33.5
       tailwind-merge:
-        specifier: 2.5.4
-        version: 2.5.4
+        specifier: 2.6.0
+        version: 2.6.0
     devDependencies:
       '@types/node':
         specifier: 20.16.11
@@ -7835,11 +7835,8 @@ packages:
   tabbable@6.2.0:
     resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
 
-  tailwind-merge@2.5.4:
-    resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==}
-
-  tailwind-merge@2.5.5:
-    resolution: {integrity: sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==}
+  tailwind-merge@2.6.0:
+    resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
   tailwindcss@3.4.13:
     resolution: {integrity: sha512-KqjHOJKogOUt5Bs752ykCeiwvi0fKVkr5oqsFNt/8px/tA8scFPIlkygsf6jXrfCqGHz7VflA6+yytWuM+XhFw==}
@@ -16984,9 +16981,7 @@ snapshots:
 
   tabbable@6.2.0: {}
 
-  tailwind-merge@2.5.4: {}
-
-  tailwind-merge@2.5.5: {}
+  tailwind-merge@2.6.0: {}
 
   tailwindcss@3.4.13(ts-node@10.9.1(@swc/core@1.10.1(@swc/helpers@0.5.13))(@types/node@20.16.11)(typescript@5.7.2)):
     dependencies:
diff --git a/website/package.json b/website/package.json
index 9a734ba5..6448e10f 100644
--- a/website/package.json
+++ b/website/package.json
@@ -19,7 +19,7 @@
     "react-dom": "catalog:",
     "react-simple-typewriter": "5.0.1",
     "sharp": "0.33.5",
-    "tailwind-merge": "2.5.4"
+    "tailwind-merge": "2.6.0"
   },
   "devDependencies": {
     "@types/node": "20.16.11",