From 23b1f17cab04323aae43aa5bf9c7054c660dab87 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 Jun 2026 12:46:11 +0000 Subject: [PATCH] Bump tailwind-merge from 3.5.0 to 3.6.0 Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v3.5.0...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] --- pnpm-lock.yaml | 10 +++++----- sites/hacklytics2027/package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4671993f..0b514efb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -272,8 +272,8 @@ importers: specifier: 5.6.0 version: 5.6.0(react@19.0.0) tailwind-merge: - specifier: 3.5.0 - version: 3.5.0 + specifier: 3.6.0 + version: 3.6.0 devDependencies: '@next/eslint-plugin-next': specifier: 16.2.6 @@ -4672,8 +4672,8 @@ packages: 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@4.0.0: resolution: {integrity: sha512-ULRPI3A+e39T7pSaf1xoi58AqqJxVCLg8F/uM5A3FadUbnyDTgltVnXJvdkTjwCOGA6NazqHVcwPJC5h2vRYVQ==} @@ -9203,7 +9203,7 @@ snapshots: tailwind-merge@2.6.1: {} - tailwind-merge@3.5.0: {} + tailwind-merge@3.6.0: {} tailwindcss@4.0.0: {} diff --git a/sites/hacklytics2027/package.json b/sites/hacklytics2027/package.json index 22c2c2ce..d845fc15 100644 --- a/sites/hacklytics2027/package.json +++ b/sites/hacklytics2027/package.json @@ -22,7 +22,7 @@ "react": "19.0.0", "react-dom": "19.0.0", "react-icons": "5.6.0", - "tailwind-merge": "3.5.0" + "tailwind-merge": "3.6.0" }, "devDependencies": { "@next/eslint-plugin-next": "16.2.6",