Merge branch 'main' into renovate/major-nextjs-monorepo

Laurel-Public-Schools · Jun 13, 2024 · 59b8286 · 59b8286
2 parents 5a3857b + 3b7dd52
commit 59b8286
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/front-end/package.json b/front-end/package.json
@@ -89,7 +89,7 @@
     "superjson": "^2.2.1",
     "sweetalert2": "^11.11.1",
     "sweetalert2-react-content": "^5.0.7",
-    "tailwind-merge": "^1.14.0",
+    "tailwind-merge": "^2.3.0",
     "tailwind-scrollbar": "^3.1.0",
     "tailwindcss": "3.3.2",
     "tailwindcss-animate": "^1.0.7",

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