From 37f48b891eb3be3443d910008d219055bbeeb1e8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Nov 2024 14:51:44 +0000
Subject: [PATCH] Bump tailwind-merge from 1.12.0 to 2.5.5

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

---
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 e99061f..c97d06e 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.5"
   }
 }
diff --git a/yarn.lock b/yarn.lock
index 5917f28..b47d998 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1751,7 +1751,7 @@ __metadata:
     postcss: ^8.4.39
     svelte: ^3.58.0
     svelte-check: ^3.3.1
-    tailwind-merge: ^1.12.0
+    tailwind-merge: ^2.5.5
     tailwindcss: ^3.3.2
     tslib: ^2.5.0
     typescript: ^5.0.4
@@ -2361,10 +2361,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.5":
+  version: 2.5.5
+  resolution: "tailwind-merge@npm:2.5.5"
+  checksum: c835c763642988aa7185f242f93a61a6ce45d577edbefa4016727e664d9e130fa153b0d3a8bbcfcefd1de6a204e9d302971826d4d1068b6fd92ef66a27f35351
   languageName: node
   linkType: hard