From b28b5740038ed4822c824cf5e9b36ff4ff40937e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 10 Jul 2026 22:28:15 +0000
Subject: [PATCH] chore(deps): update dependency tailwind-merge to v3.6.0

---
 desktop/package-lock.json | 8 ++++----
 desktop/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/desktop/package-lock.json b/desktop/package-lock.json
index abc2db479..1c922bbdf 100644
--- a/desktop/package-lock.json
+++ b/desktop/package-lock.json
@@ -39,7 +39,7 @@
         "svelte": "5.56.4",
         "svelte-check": "4.7.2",
         "svelte-sonner": "1.1.1",
-        "tailwind-merge": "3.5.0",
+        "tailwind-merge": "3.6.0",
         "tailwind-variants": "3.2.2",
         "tailwindcss": "4.3.2",
         "tw-animate-css": "1.4.0",
@@ -8359,9 +8359,9 @@
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "3.5.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz",
-      "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz",
+      "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==",
       "dev": true,
       "license": "MIT",
       "funding": {
diff --git a/desktop/package.json b/desktop/package.json
index c75671e8b..c48e1a959 100644
--- a/desktop/package.json
+++ b/desktop/package.json
@@ -51,7 +51,7 @@
     "svelte": "5.56.4",
     "svelte-check": "4.7.2",
     "svelte-sonner": "1.1.1",
-    "tailwind-merge": "3.5.0",
+    "tailwind-merge": "3.6.0",
     "tailwind-variants": "3.2.2",
     "tailwindcss": "4.3.2",
     "tw-animate-css": "1.4.0",