From f08f91759a972473d3d3b1eb026dafb455f17b37 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Sep 2024 14:48:18 +0000
Subject: [PATCH] Bump tailwind-merge from 1.12.0 to 2.5.2

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.12.0 to 2.5.2.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.12.0...v2.5.2)

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

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

diff --git a/package.json b/package.json
index 261a8a8..c4c127e 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,6 @@
   },
   "packageManager": "yarn@3.5.1",
   "dependencies": {
-    "tailwind-merge": "^1.12.0"
+    "tailwind-merge": "^2.5.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 57748bd..22d6e75 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1727,7 +1727,7 @@ __metadata:
     postcss: ^8.4.39
     svelte: ^3.58.0
     svelte-check: ^3.3.1
-    tailwind-merge: ^1.12.0
+    tailwind-merge: ^2.5.2
     tailwindcss: ^3.3.2
     tslib: ^2.5.0
     typescript: ^5.0.4
@@ -2306,10 +2306,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwind-merge@npm:^1.12.0":
-  version: 1.12.0
-  resolution: "tailwind-merge@npm:1.12.0"
-  checksum: 5ef323eec1051c4aa9626e29498f6c058dbbb242ca8156aa298de41ada3eda05a8f5f1260a57112c155f63b2e94c4b4ccab5386d60fae54de07aac6d9dbc60e4
+"tailwind-merge@npm:^2.5.2":
+  version: 2.5.2
+  resolution: "tailwind-merge@npm:2.5.2"
+  checksum: af745fc16245ac14eb5d3f0b9d076c024321877ad45f43b324465f6aa7f8b5de3816640594fbf6ac8b3500f70ff2687345787888744196ff6f82dfe9a1f99b97
   languageName: node
   linkType: hard