From 164d7dfa277911b1185b54fae0cf7ed106a851fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 30 Dec 2024 03:05:32 +0000
Subject: [PATCH] Bump tailwind-merge from 2.5.4 to 2.6.0

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

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

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 b9db296..f2964c8 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "react-tsparticles": "2.12.2",
     "react-typed": "2.0.12",
     "swiper": "11.1.15",
-    "tailwind-merge": "2.5.4",
+    "tailwind-merge": "2.6.0",
     "tailwind-scrollbar": "3.1.0",
     "tsparticles": "2.12.0",
     "tsparticles-engine": "2.12.0"
diff --git a/yarn.lock b/yarn.lock
index 0b41a02..bdbccdf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2485,7 +2485,7 @@ __metadata:
     react-tsparticles: "npm:2.12.2"
     react-typed: "npm:2.0.12"
     swiper: "npm:11.1.15"
-    tailwind-merge: "npm:2.5.4"
+    tailwind-merge: "npm:2.6.0"
     tailwind-scrollbar: "npm:3.1.0"
     tailwindcss: "npm:3.4.15"
     tsparticles: "npm:2.12.0"
@@ -4465,10 +4465,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.6.0":
+  version: 2.6.0
+  resolution: "tailwind-merge@npm:2.6.0"
+  checksum: 10c0/fc8a5535524de9f4dacf1c16ab298581c7bb757d68a95faaf28942b1c555a619bba9d4c6726fe83986e44973b315410c1a5226e5354c30ba82353bd6d2288fa5
   languageName: node
   linkType: hard