From 875d38c15cb3870b3c909a0f527ca1c7d13760ea Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Apr 2025 13:43:50 +0000
Subject: [PATCH] Bump tailwind-merge from 3.1.0 to 3.2.0

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

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

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 eae81db..8b4a01d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,6 +7,7 @@
     "": {
       "name": "tauri-app",
       "version": "0.1.0",
+      "license": "MIT",
       "dependencies": {
         "@hookform/resolvers": "^5.0.1",
         "@radix-ui/react-dropdown-menu": "^2.1.6",
@@ -21,7 +22,7 @@
         "react": "^19.1.0",
         "react-dom": "^19.1.0",
         "react-hook-form": "^7.55.0",
-        "tailwind-merge": "^3.1.0",
+        "tailwind-merge": "^3.2.0",
         "tailwindcss": "^4.1.2",
         "tw-animate-css": "^1.2.5",
         "zod": "^3.24.2"
@@ -3728,9 +3729,9 @@
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.1.0.tgz",
-      "integrity": "sha512-aV27Oj8B7U/tAOMhJsSGdWqelfmudnGMdXIlMnk1JfsjwSjts6o8HyfN7SFH3EztzH4YH8kk6GbLTHzITJO39Q==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.2.0.tgz",
+      "integrity": "sha512-FQT/OVqCD+7edmmJpsgCsY820RTD5AkBryuG5IUqR5YQZSdj5xlH5nLgH7YPths7WsLPSpSBNneJdM8aS8aeFA==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/package.json b/package.json
index 2284d35..c298239 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-hook-form": "^7.55.0",
-    "tailwind-merge": "^3.1.0",
+    "tailwind-merge": "^3.2.0",
     "tailwindcss": "^4.1.2",
     "tw-animate-css": "^1.2.5",
     "zod": "^3.24.2"