From fc7365ba496ddc9e6ad3319b57ba937b247fae96 Mon Sep 17 00:00:00 2001 From: Rizumu Ayaka Date: Tue, 2 Sep 2025 14:35:28 +0800 Subject: [PATCH] fix: the version of tailwind-merge does not match --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index fc3c72565b..e1642eb77d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -44,7 +44,7 @@ "primeicons": "^7.0.0", "primevue": "^4.2.5", "semver": "^7.7.2", - "tailwind-merge": "^3.3.1", + "tailwind-merge": "^2.6.0", "three": "^0.170.0", "tiptap-markdown": "^0.8.10", "vue": "^3.5.13", @@ -15242,9 +15242,9 @@ } }, "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==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", + "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", "license": "MIT", "funding": { "type": "github", diff --git a/package.json b/package.json index ea446acc15..088afb28fd 100644 --- a/package.json +++ b/package.json @@ -110,7 +110,7 @@ "primeicons": "^7.0.0", "primevue": "^4.2.5", "semver": "^7.7.2", - "tailwind-merge": "^3.3.1", + "tailwind-merge": "^2.6.0", "three": "^0.170.0", "tiptap-markdown": "^0.8.10", "vue": "^3.5.13",