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

…rn/tailwind-merge-2.5.3 ⬆️ Bump tailwind-merge from 2.5.2 to 2.5.3
AtCoder-NoviSteps · Oct 4, 2024 · 829347f · 829347f
2 parents fbd0852 + eeacfb1
commit 829347f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "prisma-erd-generator": "1.11.2",
     "svelte-add": "2023.9.17-0.0",
     "svelte-eslint-parser": "^0.41.1",
-    "tailwind-merge": "2.5.2",
+    "tailwind-merge": "2.5.3",
     "tailwindcss": "3.4.13",
     "vercel": "37.6.1",
     "xss": "1.0.15"

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