Merge pull request #11 from fsubal/dependabot/npm_and_yarn/tailwind-m…

…erge-2.0.0 Bump tailwind-merge from 1.14.0 to 2.0.0
fsubal · Oct 30, 2023 · ebf0a2d · ebf0a2d
2 parents 642394f + 9a715a6
commit ebf0a2d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/第6章_Tailwind_CSSでコンポーネントを設計する/package.json b/src/第6章_Tailwind_CSSでコンポーネントを設計する/package.json
@@ -22,7 +22,7 @@
     "react-aria": "^3.29.1",
     "react-aria-components": "^1.0.0-beta.2",
     "react-dom": "^18.2.0",
-    "tailwind-merge": "^1.14.0",
+    "tailwind-merge": "^2.0.0",
     "tailwind-variants": "^0.1.14",
     "tailwindcss-animate": "^1.0.7"
   },