From 3b7dd52b596f87e77d56ea43b2af3eadde689989 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 13 Jun 2024 16:03:32 +0000
Subject: [PATCH] fix(deps): update dependency tailwind-merge to v2

---
 front-end/package.json |  2 +-
 pnpm-lock.yaml         | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/front-end/package.json b/front-end/package.json
index bc9ce579..2ebc7df4 100644
--- a/front-end/package.json
+++ b/front-end/package.json
@@ -89,7 +89,7 @@
     "superjson": "^2.2.1",
     "sweetalert2": "^11.11.1",
     "sweetalert2-react-content": "^5.0.7",
-    "tailwind-merge": "^1.14.0",
+    "tailwind-merge": "^2.3.0",
     "tailwind-scrollbar": "^3.1.0",
     "tailwindcss": "3.3.2",
     "tailwindcss-animate": "^1.0.7",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f4cf8d1f..ac35f2c1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -246,8 +246,8 @@ importers:
         specifier: ^5.0.7
         version: 5.0.7(react-dom@19.0.0-rc-f3e09d6328-20240612(react@19.0.0-rc-f3e09d6328-20240612))(react@19.0.0-rc-f3e09d6328-20240612)(sweetalert2@11.11.1)
       tailwind-merge:
-        specifier: ^1.14.0
-        version: 1.14.0
+        specifier: ^2.3.0
+        version: 2.3.0
       tailwind-scrollbar:
         specifier: ^3.1.0
         version: 3.1.0(tailwindcss@3.3.2(ts-node@10.9.2(@types/node@20.14.2)(typescript@5.4.5)))
@@ -5605,8 +5605,8 @@ packages:
   sweetalert2@11.11.1:
     resolution: {integrity: sha512-7jumu0I0/QdRa5R7K1mh05ZdhmsMV6rZOVtjpratZGidxyJD4Sn7rDSA+zmKHzvMef9hVTwPmDU3VxnvhVQMNg==}
 
-  tailwind-merge@1.14.0:
-    resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
+  tailwind-merge@2.3.0:
+    resolution: {integrity: sha512-vkYrLpIP+lgR0tQCG6AP7zZXCTLc1Lnv/CCRT3BqJ9CZ3ui2++GPaGb1x/ILsINIMSYqqvrpqjUFsMNLlW99EA==}
 
   tailwind-scrollbar@3.1.0:
     resolution: {integrity: sha512-pmrtDIZeHyu2idTejfV59SbaJyvp1VRjYxAjZBH0jnyrPRo6HL1kD5Glz8VPagasqr6oAx6M05+Tuw429Z8jxg==}
@@ -11668,7 +11668,9 @@ snapshots:
 
   sweetalert2@11.11.1: {}
 
-  tailwind-merge@1.14.0: {}
+  tailwind-merge@2.3.0:
+    dependencies:
+      '@babel/runtime': 7.24.7
 
   tailwind-scrollbar@3.1.0(tailwindcss@3.3.2(ts-node@10.9.2(@types/node@20.14.2)(typescript@5.4.5))):
     dependencies: