From 4f65ac3e82633548ec48ff50907744ce72c5146c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 May 2026 01:59:50 +0000 Subject: [PATCH] Bump tailwind-merge from 3.3.1 to 3.6.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.3.1 to 3.6.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v3.3.1...v3.6.0) --- updated-dependencies: - dependency-name: tailwind-merge dependency-version: 3.6.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- package-lock.json | 9 +++++---- package.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 80c008a..1740ea0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "sass": "^1.93.2", "styled-components": "^6.3.6", "swiper": "^11.1.4", - "tailwind-merge": "^3.3.1", + "tailwind-merge": "^3.6.0", "three": "^0.176.0", "vanilla-tilt": "^1.8.1" }, @@ -25907,9 +25907,10 @@ } }, "node_modules/tailwind-merge": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz", - "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==", + "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==", + "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/package.json b/package.json index c6d0a65..970df7b 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "sass": "^1.93.2", "styled-components": "^6.3.6", "swiper": "^11.1.4", - "tailwind-merge": "^3.3.1", + "tailwind-merge": "^3.6.0", "three": "^0.176.0", "vanilla-tilt": "^1.8.1" },