Merge pull request #341 from pail23/dependabot/npm_and_yarn/tailwind-…

…merge-2.5.2 Bump tailwind-merge from 2.5.1 to 2.5.2
pail23 · Sep 16, 2024 · ac2f480 · ac2f480
2 parents aa3ced7 + 844a8c5
commit ac2f480
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
  "material-design-icons-iconfont": "^6.7.0",
  "mobile-detect": "^1.4.5",
  "roboto-fontface": "*",
- "tailwind-merge": "^2.5.1",
+ "tailwind-merge": "^2.5.2",
  "vite-plugin-vuetify": "^1.0.2",
  "vue": "^3.4.38",
  "vue-chartjs": "^5.3.1",

diff --git a/yarn.lock b/yarn.lock
@@ -4130,10 +4130,10 @@ synckit@^0.9.1:
  "@pkgr/core" "^0.1.0"
  tslib "^2.6.2"
 
-tailwind-merge@^2.5.1:
- version "2.5.1"
- resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.1.tgz#55fe73fca04a0f2baae32bc9ff6f317616fa8ba3"
- integrity sha512-1zKDdExKvNltulO+J0x/Rqv40xQn78FHsEQVn3rxt8e4HdebRIT6o6zGeLYlGuxd3Efue9Y69qsp8vKwEhuEeg==
+tailwind-merge@^2.5.2:
+ version "2.5.2"
+ resolved "https://registry.yarnpkg.com/tailwind-merge/-/tailwind-merge-2.5.2.tgz#000f05a703058f9f9f3829c644235f81d4c08a1f"
+ integrity sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==
 
 tailwindcss@^3.4.11:
  version "3.4.11"