From 776cd5d261e097f7df1c025384d5bd083c21f9d0 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 31 Jan 2025 03:11:34 +0000
Subject: [PATCH] fix: upgrade tailwind-merge from 2.5.5 to 2.6.0

Snyk has created this PR to upgrade tailwind-merge from 2.5.5 to 2.6.0.

See this package in npm:
tailwind-merge

See this project in Snyk:
https://app.snyk.io/org/vigneshshettyin/project/f292640c-2272-4ab3-b7a3-dc7f2f3bba3e?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8a09416..f1fd206 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53,7 +53,7 @@
         "react-share": "^5.1.0",
         "rimraf": "^5.0.10",
         "sonner": "^1.5.0",
-        "tailwind-merge": "^2.5.5",
+        "tailwind-merge": "^2.6.0",
         "tailwindcss-animate": "^1.0.7",
         "ua-parser-js": "^1.0.39",
         "zod": "^3.23.8"
@@ -9345,9 +9345,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.5.5",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.5.tgz",
-      "integrity": "sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
+      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/package.json b/package.json
index f9e2b27..bb09994 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "react-share": "^5.1.0",
     "rimraf": "^5.0.10",
     "sonner": "^1.5.0",
-    "tailwind-merge": "^2.5.5",
+    "tailwind-merge": "^2.6.0",
     "tailwindcss-animate": "^1.0.7",
     "ua-parser-js": "^1.0.39",
     "zod": "^3.23.8"