fix: the version of tailwind-merge does not match

This commit is contained in:
Rizumu Ayaka
2025-09-02 14:35:28 +08:00
parent da042ae829
commit 12d366d1d0
2 changed files with 6 additions and 6 deletions

View File

@@ -147,7 +147,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",

10
pnpm-lock.yaml generated
View File

@@ -138,8 +138,8 @@ importers:
specifier: ^7.7.2
version: 7.7.2
tailwind-merge:
specifier: ^3.3.1
version: 3.3.1
specifier: ^2.6.0
version: 2.6.0
three:
specifier: ^0.170.0
version: 0.170.0
@@ -6080,8 +6080,8 @@ packages:
resolution: {integrity: sha512-JJoOEKTfL1urb1mDoEblhD9NhEbWmq9jHEMEnxoC4ujUaZ4itA8vKgwkFAyNClgxplLi9tsUKX+EduK0p/l7sg==}
engines: {node: ^14.18.0 || >=16.0.0}
tailwind-merge@3.3.1:
resolution: {integrity: sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==}
tailwind-merge@2.6.0:
resolution: {integrity: sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==}
tailwindcss@3.4.4:
resolution: {integrity: sha512-ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==}
@@ -13557,7 +13557,7 @@ snapshots:
'@pkgr/core': 0.1.2
tslib: 2.8.1
tailwind-merge@3.3.1: {}
tailwind-merge@2.6.0: {}
tailwindcss@3.4.4:
dependencies: