Skip to content

Commit ebb3ec6

Browse files
chore: update dependency tailwind-merge to v1.14.0 (#332)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
1 parent f69bf42 commit ebb3ec6

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
@@ -85,7 +85,7 @@
8585
"postcss": "8.5.6",
8686
"prettier": "2.8.8",
8787
"prettier-plugin-tailwindcss": "0.6.12",
88-
"tailwind-merge": "1.8.0",
88+
"tailwind-merge": "1.14.0",
8989
"tailwindcss": "3.2.4",
9090
"typescript": "4.9.5",
9191
"typescript-graphql-request": "4.4.6",

yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10183,10 +10183,10 @@ swap-case@^2.0.2:
1018310183
dependencies:
1018410184
tslib "^2.0.3"
1018510185

10186-
tailwind-merge@1.8.0:
10187-
version "1.8.0"
10188-
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.8.0.tgz#41c4730b2a51ca7a905c6beebcbfe237bfb61f30"
10189-
integrity sha512-tER/2SbYRdfPYg6m4pDWZSlbymLTmDi+dx4iCsJmgmz4UDGzgnVelOvBe3GNtGCw9Bmc4MiObfJJbKeVL+KnMQ==
10186+
tailwind-merge@1.14.0:
10187+
version "1.14.0"
10188+
resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-1.14.0.tgz#e677f55d864edc6794562c63f5001f45093cdb8b"
10189+
integrity sha512-3mFKyCo/MBcgyOTlrY8T7odzZFx+w+qKSMAmdFzRvqBfLlSigU6TZnlFHK0lkMwj9Bj8OYU+9yW9lmGuS0QEnQ==
1019010190

1019110191
1019210192
version "3.2.4"

0 commit comments

Comments
 (0)