From bfb59ee2409b97b6617d0129af23314f0693d871 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 14 Oct 2024 13:05:50 +0000
Subject: [PATCH] fix(deps): update dependency tailwind-merge to ^2.5.4

---
 packages/boutique/frontend/package.json |  2 +-
 packages/wallet/frontend/package.json   |  2 +-
 pnpm-lock.yaml                          | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/boutique/frontend/package.json b/packages/boutique/frontend/package.json
index df3ce25fa..bf01f2b73 100644
--- a/packages/boutique/frontend/package.json
+++ b/packages/boutique/frontend/package.json
@@ -25,7 +25,7 @@
     "react-hook-form": "^7.53.0",
     "react-router-dom": "^6.26.2",
     "remix-params-helper": "^0.5.1",
-    "tailwind-merge": "^2.5.3",
+    "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",
     "valtio": "^2.0.0",
     "zod": "^3.23.8"
diff --git a/packages/wallet/frontend/package.json b/packages/wallet/frontend/package.json
index a8447da31..ec6d90c3a 100644
--- a/packages/wallet/frontend/package.json
+++ b/packages/wallet/frontend/package.json
@@ -24,7 +24,7 @@
     "react-select": "^5.8.1",
     "sharp": "^0.33.5",
     "socket.io-client": "^4.8.0",
-    "tailwind-merge": "^2.5.3",
+    "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",
     "valtio": "^2.0.0",
     "zod": "^3.23.8"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d6448e867..b68a885ca 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -181,8 +181,8 @@ importers:
         specifier: ^0.5.1
         version: 0.5.1(zod@3.23.8)
       tailwind-merge:
-        specifier: ^2.5.3
-        version: 2.5.3
+        specifier: ^2.5.4
+        version: 2.5.4
       tailwindcss-animate:
         specifier: ^1.0.7
         version: 1.0.7(tailwindcss@3.4.13)
@@ -464,8 +464,8 @@ importers:
         specifier: ^4.8.0
         version: 4.8.0
       tailwind-merge:
-        specifier: ^2.5.3
-        version: 2.5.3
+        specifier: ^2.5.4
+        version: 2.5.4
       tailwindcss-animate:
         specifier: ^1.0.7
         version: 1.0.7(tailwindcss@3.4.13)
@@ -5900,8 +5900,8 @@ packages:
   tabbable@6.2.0:
     resolution: {integrity: sha512-Cat63mxsVJlzYvN51JmVXIgNoUokrIaT2zLclCXjRd8boZ0004U4KCs/sToJ75C6sdlByWxpYnb5Boif1VSFew==}
 
-  tailwind-merge@2.5.3:
-    resolution: {integrity: sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==}
+  tailwind-merge@2.5.4:
+    resolution: {integrity: sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==}
 
   tailwindcss-animate@1.0.7:
     resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
@@ -12734,7 +12734,7 @@ snapshots:
 
   tabbable@6.2.0: {}
 
-  tailwind-merge@2.5.3: {}
+  tailwind-merge@2.5.4: {}
 
   tailwindcss-animate@1.0.7(tailwindcss@3.4.13):
     dependencies: