From b0a8b71fcd9cd83365af850873ad9df28836cf53 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Wed, 2 Oct 2024 08:43:57 +0000
Subject: [PATCH] fix: upgrade tailwind-merge from 2.2.1 to 2.5.2

Snyk has created this PR to upgrade tailwind-merge from 2.2.1 to 2.5.2.

See this package in npm:
tailwind-merge

See this project in Snyk:
https://app.snyk.io/org/junjiepro/project/650363a2-50f2-4849-9d1e-b4002018f549?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 package-lock.json | 12 +++++-------
 package.json      |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d0f9fe3..4da7647 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -58,7 +58,7 @@
         "remark-toc": "^9.0.0",
         "sonner": "^1.4.41",
         "swr": "^2.2.5",
-        "tailwind-merge": "^2.2.1",
+        "tailwind-merge": "^2.5.2",
         "tailwindcss-animate": "^1.0.7",
         "vaul": "^0.9.0",
         "zod": "^3.22.4"
@@ -8401,12 +8401,10 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.2.1.tgz",
-      "integrity": "sha512-o+2GTLkthfa5YUt4JxPfzMIpQzZ3adD1vLVkvKE1Twl9UAhGsEbIZhHHZVRttyW177S8PDJI3bTQNaebyofK3Q==",
-      "dependencies": {
-        "@babel/runtime": "^7.23.7"
-      },
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz",
+      "integrity": "sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
diff --git a/package.json b/package.json
index f111b1c..581e18f 100644
--- a/package.json
+++ b/package.json
@@ -59,7 +59,7 @@
     "remark-toc": "^9.0.0",
     "sonner": "^1.4.41",
     "swr": "^2.2.5",
-    "tailwind-merge": "^2.2.1",
+    "tailwind-merge": "^2.5.2",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^0.9.0",
     "zod": "^3.22.4"