Skip to content

Commit

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

Bump tailwind-merge from 2.5.3 to 2.5.4
  • Loading branch information
sanidhyy authored Oct 15, 2024
2 parents 9910974 + 1c917ad commit 184ac31
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 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.5.0",
"tailwind-merge": "^2.5.3",
"tailwind-merge": "^2.5.4",
"three": "^0.169.0"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1808,10 +1808,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.3:
version "2.5.3"
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.3.tgz#579546e14ddda24462e0303acd8798c50f5511bb"
integrity sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==
tailwind-merge@^2.5.4:
version "2.5.4"
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.4.tgz#4bf574e81fa061adeceba099ae4df56edcee78d1"
integrity sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==

tailwindcss@*, tailwindcss@^3.4.13:
version "3.4.13"
Expand Down

0 comments on commit 184ac31

Please sign in to comment.