Merge pull request #99 from Kyutech-C3/dependabot/npm_and_yarn/develo…

…p/tailwind-merge-2.0.0 chore(deps-dev): bump tailwind-merge from 1.14.0 to 2.0.0
Kyutech-C3 · Nov 20, 2023 · 6d71cd2 · 6d71cd2
2 parents 7f61864 + 442aeb3
commit 6d71cd2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -102,7 +102,7 @@
     "postcss": "^8.4.31",
     "prettier": "^3.0.1",
     "storybook": "^7.2.2",
-    "tailwind-merge": "^1.14.0",
+    "tailwind-merge": "^2.0.0",
     "tailwindcss": "^3.3.3",
     "tailwindcss-animate": "^1.0.7",
     "ts-jest": "^29.1.1",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml