Skip to content

Commit e4584a2

Browse files
authored
Merge pull request #809 from Calebux/dependabot/npm_and_yarn/client/tailwind-merge-3.6.0
chore(deps): bump tailwind-merge from 2.6.1 to 3.6.0 in /client
2 parents 6681f9a + 48e8905 commit e4584a2

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

client/package-lock.json

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

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
"react-resizable-panels": "^4.11.2",
8585
"sonner": "^1.7.4",
8686
"stripe": "^22.1.0",
87-
"tailwind-merge": "^2.5.5",
87+
"tailwind-merge": "^3.6.0",
8888
"tailwindcss-animate": "^1.0.7",
8989
"vaul": "^1.1.2",
9090
"zod": "4.4.3"

0 commit comments

Comments
 (0)