From c761ac650a839835f792a3cbcae61eade71cd5e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 Jul 2023 01:02:35 +0000
Subject: [PATCH] chore(deps): bump tailwind-merge from 1.13.2 to 1.14.0
Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 1.13.2 to 1.14.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v1.13.2...v1.14.0)
---
updated-dependencies:
- dependency-name: tailwind-merge
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
---
package.json | 2 +-
pnpm-lock.yaml | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/package.json b/package.json
index 0b5193e..37a1f9b 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
"postcss": "8.4.26",
"react": "18.2.0",
"react-dom": "18.2.0",
- "tailwind-merge": "^1.13.2",
+ "tailwind-merge": "^1.14.0",
"tailwindcss": "3.3.3",
"tailwindcss-animate": "^1.0.6",
"typescript": "5.1.6"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 230521f..91a7ee4 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -54,8 +54,8 @@ dependencies:
specifier: 18.2.0
version: 18.2.0(react@18.2.0)
tailwind-merge:
- specifier: ^1.13.2
- version: 1.13.2
+ specifier: ^1.14.0
+ version: 1.14.0
tailwindcss:
specifier: 3.3.3
version: 3.3.3
@@ -2614,8 +2614,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):