Skip to content
This repository was archived by the owner on Jul 30, 2025. It is now read-only.

Commit 7512537

Browse files
authored
Merge pull request #240 from laravelcm/dependabot/npm_and_yarn/tailwind-merge-2.5.3
⬆️ Bump tailwind-merge from 2.2.0 to 2.5.3
2 parents dba1228 + ace3742 commit 7512537

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"react-redux": "^9.0.4",
2525
"redux": "^4.2.1",
2626
"redux-persist": "^6.0.0",
27-
"tailwind-merge": "^2.2.0",
27+
"tailwind-merge": "^2.5.3",
2828
"tailwindcss-animate": "^1.0.7",
2929
"typescript": "5.6.2"
3030
},

yarn.lock

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
resolved "https://registry.yarnpkg.com/@alloc/quick-lru/-/quick-lru-5.2.0.tgz#7bf68b20c0a350f936915fcae06f58e32007ce30"
1313
integrity sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==
1414

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

3940-
tailwind-merge@^2.2.0:
3941-
version "2.2.0"
3942-
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.2.0.tgz#b6bb1c63ef26283c9e6675ba237df83bbd554688"
3943-
integrity sha512-SqqhhaL0T06SW59+JVNfAqKdqLs0497esifRrZ7jOaefP3o64fdFNDMrAQWZFMxTLJPiHVjRLUywT8uFz1xNWQ==
3944-
dependencies:
3945-
"@babel/runtime" "^7.23.5"
3940+
tailwind-merge@^2.5.3:
3941+
version "2.5.3"
3942+
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.3.tgz#579546e14ddda24462e0303acd8798c50f5511bb"
3943+
integrity sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==
39463944

39473945
tailwindcss-animate@^1.0.7:
39483946
version "1.0.7"

0 commit comments

Comments
 (0)