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

Commit 4212013

Browse files
authored
Merge pull request #242 from laravelcm/dependabot/npm_and_yarn/tailwind-merge-2.5.4
Bump tailwind-merge from 2.5.3 to 2.5.4
2 parents 14725bc + 7c5c937 commit 4212013

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
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.5.3",
27+
"tailwind-merge": "^2.5.4",
2828
"tailwindcss-animate": "^1.0.7",
2929
"typescript": "5.6.2"
3030
},

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4012,10 +4012,10 @@ synckit@^0.8.4, synckit@^0.8.6:
40124012
"@pkgr/core" "^0.1.0"
40134013
tslib "^2.6.2"
40144014

4015-
tailwind-merge@^2.5.3:
4016-
version "2.5.3"
4017-
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.3.tgz#579546e14ddda24462e0303acd8798c50f5511bb"
4018-
integrity sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==
4015+
tailwind-merge@^2.5.4:
4016+
version "2.5.4"
4017+
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.4.tgz#4bf574e81fa061adeceba099ae4df56edcee78d1"
4018+
integrity sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==
40194019

40204020
tailwindcss-animate@^1.0.7:
40214021
version "1.0.7"

0 commit comments

Comments
 (0)