From 0fe985ad24a11aafed9ad389ee4aee2ada3e4fa9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 23 Dec 2024 19:25:30 +0000
Subject: [PATCH] fix(web): update dependency tailwind-merge to v2

---
 apps/web/package.json | 2 +-
 pnpm-lock.yaml        | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/web/package.json b/apps/web/package.json
index 37f1d612..2eeedc70 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -29,7 +29,7 @@
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-icons": "4.12.0",
-    "tailwind-merge": "1.14.0",
+    "tailwind-merge": "2.6.0",
     "tailwind-variants": "0.1.18",
     "tailwindcss-animate": "1.0.7",
     "typescript": "5.3.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6a99150c..ef11c5d4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -84,8 +84,8 @@ importers:
         specifier: 4.12.0
         version: 4.12.0(react@18.2.0)
       tailwind-merge:
-        specifier: 1.14.0
-        version: 1.14.0
+        specifier: 2.6.0
+        version: 2.6.0
       tailwind-variants:
         specifier: 0.1.18
         version: 0.1.18(tailwindcss@3.3.5)
@@ -11680,6 +11680,10 @@ packages:
     resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
     dev: false
 
+  /tailwind-merge@2.6.0:
+    resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
+    dev: false
+
   /tailwind-scrollbar@3.0.5(tailwindcss@3.3.5):
     resolution: {integrity: sha512-0ZwxTivevqq9BY9fRP9zDjHl7Tu+J5giBGbln+0O1R/7nHtBUKnjQcA1aTIhK7Oyjp6Uc/Dj6/dn8Dq58k5Uww==}
     engines: {node: '>=12.13.0'}