diff --git a/package-lock.json b/package-lock.json index 10b4a11..562510c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -57,7 +57,7 @@ "react-tilt": "^1.0.2", "react-vertical-timeline-component": "^3.6.0", "sonner": "^1.7.1", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^2.6.0", "three": "^0.171.0" }, "devDependencies": { @@ -3241,10 +3241,9 @@ } }, "node_modules/tailwind-merge": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.5.tgz", - "integrity": "sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==", - "license": "MIT", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", + "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/package.json b/package.json index 42ceac8..6e39b2b 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ "react-tilt": "^1.0.2", "react-vertical-timeline-component": "^3.6.0", "sonner": "^1.7.1", - "tailwind-merge": "^2.5.5", + "tailwind-merge": "^2.6.0", "three": "^0.171.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index 5cd24cb..ccd6875 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1813,10 +1813,10 @@ suspend-react@^0.1.3: resolved "https://registry.npmjs.org/suspend-react/-/suspend-react-0.1.3.tgz" integrity sha512-aqldKgX9aZqpoDp3e8/BZ8Dm7x1pJl+qI3ZKxDN0i/IQTWUwBx/ManmlVJ3wowqbno6c2bmiIfs+Um6LbsjJyQ== -tailwind-merge@^2.5.5: - version "2.5.5" - resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.5.tgz#98167859b856a2a6b8d2baf038ee171b9d814e39" - integrity sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA== +tailwind-merge@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5" + integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA== tailwindcss@*, tailwindcss@^3.4.16: version "3.4.16"