Skip to content

Commit

Permalink
Merge pull request #240 from laravelcm/dependabot/npm_and_yarn/tailwi…
Browse files Browse the repository at this point in the history
…nd-merge-2.5.3

⬆️ Bump tailwind-merge from 2.2.0 to 2.5.3
  • Loading branch information
mckenziearts authored Oct 8, 2024
2 parents dba1228 + ace3742 commit 7512537
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-redux": "^9.0.4",
"redux": "^4.2.1",
"redux-persist": "^6.0.0",
"tailwind-merge": "^2.2.0",
"tailwind-merge": "^2.5.3",
"tailwindcss-animate": "^1.0.7",
"typescript": "5.6.2"
},
Expand Down
12 changes: 5 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==

"@babel/runtime@^7.20.7", "@babel/runtime@^7.23.5", "@babel/runtime@^7.9.2":
"@babel/runtime@^7.20.7", "@babel/runtime@^7.9.2":
version "7.23.8"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.23.8.tgz#8ee6fe1ac47add7122902f257b8ddf55c898f650"
integrity sha512-Y7KbAP984rn1VGMbGqKmBLio9V7y5Je9GvU4rQPCPinCyNfUcToxIXl06d59URp/F3LwinvODxab5N/G6qggkw==
Expand Down Expand Up @@ -3937,12 +3937,10 @@ synckit@^0.8.4, synckit@^0.8.6:
"@pkgr/core" "^0.1.0"
tslib "^2.6.2"

tailwind-merge@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.2.0.tgz#b6bb1c63ef26283c9e6675ba237df83bbd554688"
integrity sha512-SqqhhaL0T06SW59+JVNfAqKdqLs0497esifRrZ7jOaefP3o64fdFNDMrAQWZFMxTLJPiHVjRLUywT8uFz1xNWQ==
dependencies:
"@babel/runtime" "^7.23.5"
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==

tailwindcss-animate@^1.0.7:
version "1.0.7"
Expand Down

0 comments on commit 7512537

Please sign in to comment.