From 1f9cba4f3254b6c06f066921a27b11a0d6a82954 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 9 Nov 2025 21:37:14 +0000
Subject: [PATCH] build(deps): Bump tailwind-merge from 2.6.0 to 3.4.0

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.6.0 to 3.4.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.6.0...v3.4.0)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-version: 3.4.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package.json   |  2 +-
 pnpm-lock.yaml | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package.json b/package.json
index 0493da6aa..eff09aebf 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "playwright": "1.56.1",
     "prisma-erd-generator": "2.1.0",
     "svelte-eslint-parser": "1.4.0",
-    "tailwind-merge": "2.6.0",
+    "tailwind-merge": "3.4.0",
     "tailwindcss": "3.4.18",
     "vercel": "48.9.0",
     "xss": "1.0.15"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 369d73e86..fe376a857 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -63,8 +63,8 @@ importers:
         specifier: 1.4.0
         version: 1.4.0(svelte@5.43.5)
       tailwind-merge:
-        specifier: 2.6.0
-        version: 2.6.0
+        specifier: 3.4.0
+        version: 3.4.0
       tailwindcss:
         specifier: 3.4.18
         version: 3.4.18(tsx@4.19.2)(yaml@2.8.1)
@@ -4603,8 +4603,8 @@ packages:
   tailwind-merge@2.6.0:
     resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
 
-  tailwind-merge@3.3.1:
-    resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
+  tailwind-merge@3.4.0:
+    resolution: {integrity: sha512-uSaO4gnW+b3Y2aWoWfFpX62vn2sR3skfhbjsEnaBI81WD1wBLlHZe5sWf0AqjksNdYTbGBEd0UasQMT3SNV15g==}
 
   tailwind-variants@0.3.1:
     resolution: {integrity: sha512-krn67M3FpPwElg4FsZrOQd0U26o7UDH/QOkK8RNaiCCrr052f6YJPBUfNKnPo/s/xRzNPtv1Mldlxsg8Tb46BQ==}
@@ -6928,7 +6928,7 @@ snapshots:
       ramda: 0.28.0
       react: 19.2.0
       react-dom: 19.2.0(react@19.2.0)
-      tailwind-merge: 3.3.1
+      tailwind-merge: 3.4.0
       tailwindcss: 3.4.18(tsx@4.19.2)(yaml@2.8.1)
     transitivePeerDependencies:
       - '@babel/core'
@@ -9676,7 +9676,7 @@ snapshots:
 
   tailwind-merge@2.6.0: {}
 
-  tailwind-merge@3.3.1: {}
+  tailwind-merge@3.4.0: {}
 
   tailwind-variants@0.3.1(tailwindcss@3.4.18(tsx@4.19.2)(yaml@2.8.1)):
     dependencies: