chore(deps): bump tailwind-merge from 2.6.1 to 3.6.0 (#1124)

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

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
dependabot[bot]
2026-06-15 20:56:04 -04:00
committed by GitHub
co-authored by dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
parent bcfa1bd8cc
commit 8f0db66131
3 changed files with 9 additions and 14 deletions
+7 -12
View File
@@ -296,8 +296,8 @@ importers:
specifier: ^1.69.0
version: 1.69.0
tailwind-merge:
specifier: ^3.3.1
version: 3.5.0
specifier: ^3.6.0
version: 3.6.0
tailwindcss:
specifier: ^4.1.14
version: 4.2.1
@@ -485,8 +485,8 @@ importers:
specifier: '>=19'
version: 19.2.7(react@19.2.7)
tailwind-merge:
specifier: ^2.6.0
version: 2.6.1
specifier: ^3.6.0
version: 3.6.0
devDependencies:
'@tailwindcss/postcss':
specifier: ^4.3.1
@@ -5867,11 +5867,8 @@ packages:
symbol-tree@3.2.4:
resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
tailwind-merge@2.6.1:
resolution: {integrity: sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==}
tailwind-merge@3.5.0:
resolution: {integrity: sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==}
tailwind-merge@3.6.0:
resolution: {integrity: sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==}
tailwindcss-animate@1.0.7:
resolution: {integrity: sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==}
@@ -12591,9 +12588,7 @@ snapshots:
symbol-tree@3.2.4: {}
tailwind-merge@2.6.1: {}
tailwind-merge@3.5.0: {}
tailwind-merge@3.6.0: {}
tailwindcss-animate@1.0.7(tailwindcss@4.2.1):
dependencies: