Skip to content

Commit

Permalink
Merge pull request #61 from sanidhyy/dependabot/npm_and_yarn/tailwind…
Browse files Browse the repository at this point in the history
…-merge-2.2.1

Bump tailwind-merge from 2.2.0 to 2.2.1
  • Loading branch information
sanidhyy authored Jan 23, 2024
2 parents 0c99456 + 959e2c6 commit 0beeb50
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
10 changes: 5 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 @@ -36,7 +36,7 @@
"react-tilt": "^1.0.2",
"react-vertical-timeline-component": "^3.6.0",
"sonner": "^1.3.1",
"tailwind-merge": "^2.2.0",
"tailwind-merge": "^2.2.1",
"three": "^0.160.0"
},
"devDependencies": {
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@
dependencies:
"@babel/helper-plugin-utils" "^7.22.5"

"@babel/runtime@^7.11.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.23.5":
"@babel/runtime@^7.11.2", "@babel/runtime@^7.17.8", "@babel/runtime@^7.23.7":
version "7.23.8"
resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.8.tgz"
integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
Expand Down Expand Up @@ -1728,12 +1728,12 @@ 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.2.0:
version "2.2.0"
resolved "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.2.0.tgz"
integrity sha512-SqqhhaL0T06SW59+JVNfAqKdqLs0497esifRrZ7jOaefP3o64fdFNDMrAQWZFMxTLJPiHVjRLUywT8uFz1xNWQ==
tailwind-merge@^2.2.1:
version "2.2.1"
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.2.1.tgz#3f10f296a2dba1d88769de8244fafd95c3324aeb"
integrity sha512-o+2GTLkthfa5YUt4JxPfzMIpQzZ3adD1vLVkvKE1Twl9UAhGsEbIZhHHZVRttyW177S8PDJI3bTQNaebyofK3Q==
dependencies:
"@babel/runtime" "^7.23.5"
"@babel/runtime" "^7.23.7"

tailwindcss@^3.3.3:
version "3.4.1"
Expand Down

0 comments on commit 0beeb50

Please sign in to comment.