From 0639550d125db312c7c1f0f0746e4ec1922ba90b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:32:43 +0300 Subject: [PATCH] chore(deps): bump tailwind-merge from 2.5.2 to 2.5.4 (#88) Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.5.2 to 2.5.4. - [Release notes](https://github.com/dcastil/tailwind-merge/releases) - [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.5.2...v2.5.4) --- updated-dependencies: - dependency-name: tailwind-merge dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4d15be6..c1b2562 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,7 +6,7 @@ "packages": { "": { "name": "trendtrack", - "version": "0.15.2", + "version": "0.18.0", "dependencies": { "@radix-ui/react-icons": "^1.3.0", "@radix-ui/react-select": "^2.1.2", @@ -18,7 +18,7 @@ "react": "^18", "react-dom": "^18", "react-icons": "^5.3.0", - "tailwind-merge": "^2.5.2", + "tailwind-merge": "^2.5.4", "tailwindcss-animate": "^1.0.7" }, "devDependencies": { @@ -5816,9 +5816,9 @@ } }, "node_modules/tailwind-merge": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.2.tgz", - "integrity": "sha512-kjEBm+pvD+6eAwzJL2Bi+02/9LFLal1Gs61+QB7HvTfQQ0aXwC5LGT8PEt1gS0CWKktKe6ysPTAy3cBC5MeiIg==", + "version": "2.5.4", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.4.tgz", + "integrity": "sha512-0q8cfZHMu9nuYP/b5Shb7Y7Sh1B7Nnl5GqNr1U+n2p6+mybvRtayrQ+0042Z5byvTA8ihjlP8Odo8/VnHbZu4Q==", "funding": { "type": "github", "url": "https://github.com/sponsors/dcastil" diff --git a/package.json b/package.json index c37b943..fe20c88 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "react": "^18", "react-dom": "^18", "react-icons": "^5.3.0", - "tailwind-merge": "^2.5.2", + "tailwind-merge": "^2.5.4", "tailwindcss-animate": "^1.0.7" }, "devDependencies": {