From 01327a7f0b91b77b5073be231a0583243e47dfdb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 12:33:23 +0000
Subject: [PATCH] Bump tailwind-merge from 2.5.4 to 2.5.5

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

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

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 37fd027f..47d749d1 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
         "react-relay": "^18.1.0",
         "react-router-dom": "^6.28.0",
         "semver": "^7.6.3",
-        "tailwind-merge": "^2.5.4",
+        "tailwind-merge": "^2.5.5",
         "tailwindcss-animate": "^1.0.7",
         "uuid": "^11.0.3",
         "zod": "^3.23.8"
diff --git a/yarn.lock b/yarn.lock
index 77e9645e..24cf37e0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7329,10 +7329,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwind-merge@npm:^2.5.4":
-  version: 2.5.4
-  resolution: "tailwind-merge@npm:2.5.4"
-  checksum: 10c0/6c3d2a1d44344f373859f005e6366f0dbd7f66131d330a51dbe823dab08f71c388b2efcbb2b6a2170ca469581d27079c25cd40c234ca1356c4893ae99c2febb3
+"tailwind-merge@npm:^2.5.5":
+  version: 2.5.5
+  resolution: "tailwind-merge@npm:2.5.5"
+  checksum: 10c0/32614dd2b4ddd4fab070d5ec569e6da00e2b34269b9ac2f2ff16733cef29a076c8e2210fbfc1904d7983a8fdb6b3e63d18ca117645f21b12ca7bcf8fe3507241
   languageName: node
   linkType: hard
 
@@ -7465,7 +7465,7 @@ __metadata:
     semver: "npm:^7.6.3"
     storybook: "npm:^8.4.5"
     storybook-addon-remix-react-router: "npm:^3.0.1"
-    tailwind-merge: "npm:^2.5.4"
+    tailwind-merge: "npm:^2.5.5"
     tailwindcss: "npm:^3.4.15"
     tailwindcss-animate: "npm:^1.0.7"
     type-fest: "npm:^4.27.0"