Merge pull request #1602 from AtCoder-NoviSteps/dependabot/npm_and_ya…

…rn/tailwind-merge-2.6.0 build(deps): Bump tailwind-merge from 2.5.5 to 2.6.0
AtCoder-NoviSteps · Dec 24, 2024 · 66f69e8 · 66f69e8
2 parents 2365515 + 6a70518
commit 66f69e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "pnpm": "9.15.1",
     "prisma-erd-generator": "1.11.2",
     "svelte-eslint-parser": "0.43.0",
-    "tailwind-merge": "2.5.5",
+    "tailwind-merge": "2.6.0",
     "tailwindcss": "3.4.17",
     "vercel": "39.2.2",
     "xss": "1.0.15"

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