From 8e0c20fab1f7b6869110f258d88412d0415d8d90 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Fri, 16 Aug 2024 12:56:23 +0000
Subject: [PATCH] fix: upgrade tailwind-merge from 2.3.0 to 2.4.0

Snyk has created this PR to upgrade tailwind-merge from 2.3.0 to 2.4.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 | 11 ++++-------
 package.json      |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a23a8bc..0612a78 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54,7 +54,7 @@
         "react-resizable-panels": "^2.0.20",
         "react-share": "^5.1.0",
         "rimraf": "^5.0.8",
-        "tailwind-merge": "^2.3.0",
+        "tailwind-merge": "^2.4.0",
         "tailwindcss-animate": "^1.0.7",
         "ua-parser-js": "^1.0.38",
         "zod": "^3.23.8"
@@ -9913,13 +9913,10 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.3.0.tgz",
-      "integrity": "sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz",
+      "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==",
       "license": "MIT",
-      "dependencies": {
-        "@babel/runtime": "^7.24.1"
-      },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
diff --git a/package.json b/package.json
index 351edfb..5fb15c8 100644
--- a/package.json
+++ b/package.json
@@ -55,7 +55,7 @@
     "react-resizable-panels": "^2.0.20",
     "react-share": "^5.1.0",
     "rimraf": "^5.0.8",
-    "tailwind-merge": "^2.3.0",
+    "tailwind-merge": "^2.4.0",
     "tailwindcss-animate": "^1.0.7",
     "ua-parser-js": "^1.0.38",
     "zod": "^3.23.8"