From fc01b90007e2ec42c246ba11ecf2a86edc8e1532 Mon Sep 17 00:00:00 2001 From: Siddhant Rai Date: Wed, 18 Jun 2025 19:00:59 +0530 Subject: [PATCH] Add tailwind-merge dependency to package.json and package-lock.json --- frontend/package-lock.json | 13 ++++++++++++- frontend/package.json | 3 ++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index d9529632..59c3a793 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -28,7 +28,8 @@ "react-syntax-highlighter": "^15.6.1", "rehype-katex": "^7.0.1", "remark-gfm": "^4.0.0", - "remark-math": "^6.0.0" + "remark-math": "^6.0.0", + "tailwind-merge": "^3.3.1" }, "devDependencies": { "@types/mermaid": "^9.1.0", @@ -10469,6 +10470,16 @@ "integrity": "sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==", "dev": true }, + "node_modules/tailwind-merge": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz", + "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==", + "license": "MIT", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/dcastil" + } + }, "node_modules/tailwindcss": { "version": "3.4.17", "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz", diff --git a/frontend/package.json b/frontend/package.json index 9a3b0953..ff4a1760 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -39,7 +39,8 @@ "react-syntax-highlighter": "^15.6.1", "rehype-katex": "^7.0.1", "remark-gfm": "^4.0.0", - "remark-math": "^6.0.0" + "remark-math": "^6.0.0", + "tailwind-merge": "^3.3.1" }, "devDependencies": { "@types/mermaid": "^9.1.0",