mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-06-21 04:45:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #933 from fosrl/dependabot/npm_and_yarn/tailwind-merge-3.3.1

Browse source 
Bump tailwind-merge from 2.6.0 to 3.3.1
This commit is contained in:
Owen Schwartz 2025-06-19 09:49:20 -04:00 • committed by GitHub
commit 4b24d722b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
package-lock.json generated
View file

@ -80,7 +80,7 @@
"rebuild": "0.1.2", "rebuild": "0.1.2",
"semver": "7.7.2", "semver": "7.7.2",
"swagger-ui-express": "^5.0.1", "swagger-ui-express": "^5.0.1",
"tailwind-merge": "2.6.0", "tailwind-merge": "3.3.1",
"tw-animate-css": "^1.3.3", "tw-animate-css": "^1.3.3",
"uuid": "^11.1.0", "uuid": "^11.1.0",
"vaul": "1.1.2", "vaul": "1.1.2",
@ -15432,9 +15432,9 @@
} }
}, },
"node_modules/tailwind-merge": { "node_modules/tailwind-merge": {
"version": "2.6.0", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz",
"integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==",
"license": "MIT", "license": "MIT",
"funding": { "funding": {
"type": "github", "type": "github",

2
package.json
View file

@ -97,7 +97,7 @@
"rebuild": "0.1.2", "rebuild": "0.1.2",
"semver": "7.7.2", "semver": "7.7.2",
"swagger-ui-express": "^5.0.1", "swagger-ui-express": "^5.0.1",
"tailwind-merge": "2.6.0", "tailwind-merge": "3.3.1",
"tw-animate-css": "^1.3.3", "tw-animate-css": "^1.3.3",
"uuid": "^11.1.0", "uuid": "^11.1.0",
"vaul": "1.1.2", "vaul": "1.1.2",