Skip to content

Commit

Permalink
Merge pull request #280 from sanidhyy/dependabot/npm_and_yarn/tailwin…
Browse files Browse the repository at this point in the history
…d-merge-2.6.0

Bump tailwind-merge from 2.5.5 to 2.6.0
  • Loading branch information
sanidhyy authored Dec 24, 2024
2 parents 373be5b + c547930 commit 0b4e96e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
9 changes: 4 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1837,10 +1837,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"
Expand Down

0 comments on commit 0b4e96e

Please sign in to comment.