From 6499a902a7e1e55c9853c7c9e8b0d654101919a4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Apr 2025 03:21:42 +0000
Subject: [PATCH] chore(deps): bump tailwind-merge from 2.6.0 to 3.1.0

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

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

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

diff --git a/package-lock.json b/package-lock.json
index ac7a7b87..e6beb090 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,7 +25,7 @@
                 "nuqs": "^2.4.1",
                 "react": "18.3.1",
                 "react-dom": "18.3.1",
-                "tailwind-merge": "^2.6.0",
+                "tailwind-merge": "^3.1.0",
                 "uuid": "^11.1.0"
             },
             "devDependencies": {
@@ -6219,9 +6219,10 @@
             "license": "MIT"
         },
         "node_modules/tailwind-merge": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-            "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.1.0.tgz",
+            "integrity": "sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==",
+            "license": "MIT",
             "funding": {
                 "type": "github",
                 "url": "https://github.com/sponsors/dcastil"
diff --git a/package.json b/package.json
index fec3852c..f0ee214a 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
         "nuqs": "^2.4.1",
         "react": "18.3.1",
         "react-dom": "18.3.1",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^3.1.0",
         "uuid": "^11.1.0"
     },
     "devDependencies": {