From fe1ac0d7859159fa35a547e5dc4ad9296fa0222e Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Mon, 2 Sep 2024 07:47:14 +0000
Subject: [PATCH] fix: upgrade tailwind-merge from 2.4.0 to 2.5.0

Snyk has created this PR to upgrade tailwind-merge from 2.4.0 to 2.5.0.

See this package in npm:
tailwind-merge

See this project in Snyk:
https://app.snyk.io/org/gouravng/project/ed127966-06de-4ad1-862c-dabce35a7ba9?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c41a293..ed42a33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,7 +16,7 @@
         "pg": "^8.12.0",
         "react": "^18",
         "react-dom": "^18",
-        "tailwind-merge": "^2.4.0",
+        "tailwind-merge": "^2.5.0",
         "tailwindcss-animate": "^1.0.7"
       },
       "devDependencies": {
@@ -4579,9 +4579,10 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz",
-      "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.0.tgz",
+      "integrity": "sha512-a6Q/isR5XAo9IR7Hjh80BQDkn8PG9ONJpSO/U3vGzdKyKG125lPHNXdiPfeQ5X0EOG0qKlS/0qnxdBYkLlD6tA==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
diff --git a/package.json b/package.json
index c443e5f..bc5f856 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "pg": "^8.12.0",
     "react": "^18",
     "react-dom": "^18",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^2.5.0",
     "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {