Skip to content

Commit 2072148

Browse files
Merge pull request #994 from FleetAdmiralJakob/renovate/tailwind-merge-3.x
fix(deps): update dependency tailwind-merge to v3
2 parents e80e87f + 7c057d1 commit 2072148

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"react-responsive": "^10.0.0",
6464
"react-scan": "^0.1.0",
6565
"sonner": "^1.7.0",
66-
"tailwind-merge": "^2.5.4",
66+
"tailwind-merge": "^3.0.0",
6767
"tailwindcss-animate": "^1.0.7",
6868
"zod": "^3.23.8"
6969
},

pnpm-lock.yaml

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)