From aa34cc6b1b9667d1d06c6bc85de5d04c3275bfe0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Apr 2025 21:40:05 +0000
Subject: [PATCH] build(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 | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f934db1..5a3182c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -26,7 +26,7 @@
         "node-cron": "^3.0.3",
         "react": "^18",
         "react-dom": "^18",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^3.1.0",
         "tailwindcss-animate": "^1.0.7"
       },
       "devDependencies": {
@@ -6233,9 +6233,9 @@
       }
     },
     "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",
diff --git a/package.json b/package.json
index 00a1d5e..32338b6 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "node-cron": "^3.0.3",
     "react": "^18",
     "react-dom": "^18",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.1.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {