From ea24df1a9d0475cac1d5f0cb722e1f1cc4de5588 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Feb 2026 18:51:53 +0000
Subject: [PATCH] chore(deps): bump tailwind-merge from 2.6.0 to 3.4.0 in
 /admin

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>
---
 admin/package-lock.json | 20 ++++----------------
 admin/package.json      |  2 +-
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/admin/package-lock.json b/admin/package-lock.json
index 4057a7ce..4c4e3009 100644
--- a/admin/package-lock.json
+++ b/admin/package-lock.json
@@ -19,7 +19,7 @@
         "pinia": "^2.3.0",
         "pinia-plugin-persistedstate": "~3.2.3",
         "radix-vue": "^1.9.11",
-        "tailwind-merge": "^2.6.0",
+        "tailwind-merge": "^3.4.1",
         "vue": "^3.5.13",
         "vue-chartjs": "^5.3.3",
         "vue-i18n": "^11.2.8",
@@ -1268,7 +1268,6 @@
       "version": "22.19.7",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "undici-types": "~6.21.0"
       }
@@ -1324,7 +1323,6 @@
       "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
       "dev": true,
       "license": "BSD-2-Clause",
-      "peer": true,
       "dependencies": {
         "@typescript-eslint/scope-manager": "7.18.0",
         "@typescript-eslint/types": "7.18.0",
@@ -1703,7 +1701,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1921,7 +1918,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -1993,7 +1989,6 @@
     "node_modules/chart.js": {
       "version": "4.5.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@kurkle/color": "^0.3.0"
       },
@@ -2279,7 +2274,6 @@
       "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -2904,7 +2898,6 @@
       "version": "1.21.7",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -3309,7 +3302,6 @@
     "node_modules/pinia": {
       "version": "2.3.1",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/devtools-api": "^6.6.3",
         "vue-demi": "^0.14.10"
@@ -3361,7 +3353,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
@@ -3882,7 +3873,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.0",
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.4.1.tgz",
+      "integrity": "sha512-2OA0rFqWOkITEAOFWSBSApYkDeH9t2B3XSJuI4YztKBzK3mX0737A2qtxDZ7xkw9Zfh0bWl+r34sF3HXV+Ig7Q==",
       "license": "MIT",
       "funding": {
         "type": "github",
@@ -3986,7 +3979,6 @@
       "version": "4.0.3",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -4057,7 +4049,6 @@
       "version": "5.6.3",
       "devOptional": true,
       "license": "Apache-2.0",
-      "peer": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4119,7 +4110,6 @@
       "version": "6.4.1",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.25.0",
         "fdir": "^6.4.4",
@@ -4209,7 +4199,6 @@
       "version": "4.0.3",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -4225,7 +4214,6 @@
     "node_modules/vue": {
       "version": "3.5.27",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@vue/compiler-dom": "3.5.27",
         "@vue/compiler-sfc": "3.5.27",
diff --git a/admin/package.json b/admin/package.json
index 105e16e4..dea40980 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -24,7 +24,7 @@
     "pinia": "^2.3.0",
     "pinia-plugin-persistedstate": "~3.2.3",
     "radix-vue": "^1.9.11",
-    "tailwind-merge": "^2.6.0",
+    "tailwind-merge": "^3.4.1",
     "vue": "^3.5.13",
     "vue-chartjs": "^5.3.3",
     "vue-i18n": "^11.2.8",