Merge pull request #137 from walnuts1018/renovate/tailwind-merge-3.x

walnuts1018 · Feb 2, 2025 · cfad7e7 · cfad7e7
2 parents 7effeda + 7d7c9ab
commit cfad7e7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "react-share": "^5.1.1",
     "rss-parser": "^3.13.0",
     "swr": "^2.2.5",
-    "tailwind-merge": "^2.5.5"
+    "tailwind-merge": "^3.0.0"
   },
   "devDependencies": {
     "@eslint/compat": "^1.2.3",

diff --git a/yarn.lock b/yarn.lock
@@ -3018,10 +3018,10 @@ swr@^2.2.5:
     dequal "^2.0.3"
     use-sync-external-store "^1.4.0"
 
-tailwind-merge@^2.5.5:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.6.0.tgz#ac5fb7e227910c038d458f396b7400d93a3142d5"
-  integrity sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==
+tailwind-merge@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-3.0.1.tgz#0f0189966511ebcd63ef98d9eaf5607beb0d59d3"
+  integrity sha512-AvzE8FmSoXC7nC+oU5GlQJbip2UO7tmOhOfQyOmPhrStOGXHU08j8mZEHZ4BmCqY5dWTCo4ClWkNyRNx1wpT0g==
 
 tailwindcss@^3.4.1:
   version "3.4.17"