Merge pull request #100 from bartvdbraak/dependabot/npm_and_yarn/tailwind-merge-1.14.0

This commit is contained in:
Bart van der Braak 2023-07-19 11:53:35 +02:00 committed by GitHub
commit 07ffa8897a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View file

@ -38,7 +38,7 @@
"react": "18.2.0",
"react-dom": "18.2.0",
"react-wrap-balancer": "^1.0.0",
"tailwind-merge": "^1.13.2",
"tailwind-merge": "^1.14.0",
"tailwindcss-animate": "^1.0.6"
},
"devDependencies": {

View file

@ -66,8 +66,8 @@ dependencies:
specifier: ^1.0.0
version: 1.0.0(react@18.2.0)
tailwind-merge:
specifier: ^1.13.2
version: 1.13.2
specifier: ^1.14.0
version: 1.14.0
tailwindcss-animate:
specifier: ^1.0.6
version: 1.0.6(tailwindcss@3.3.3)
@ -4022,8 +4022,8 @@ packages:
tslib: 2.5.3
dev: false
/tailwind-merge@1.13.2:
resolution: {integrity: sha512-R2/nULkdg1VR/EL4RXg4dEohdoxNUJGLMnWIQnPKL+O9Twu7Cn3Rxi4dlXkDzZrEGtR+G+psSXFouWlpTyLhCQ==}
/tailwind-merge@1.14.0:
resolution: {integrity: sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==}
dev: false
/tailwindcss-animate@1.0.6(tailwindcss@3.3.3):