From 34510c36059ceaab4f250dfb870d571d8b7274ee Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Aug 2024 23:53:33 +0800
Subject: [PATCH] chore(deps): bump tailwind-merge from 2.4.0 to 2.5.1 in
 /frontend (#3341)

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.4.0 to 2.5.1.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.4.0...v2.5.1)

---
updated-dependencies:
- dependency-name: tailwind-merge
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 frontend/package-lock.json | 8 ++++----
 frontend/package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 2fa25e0745..3e6ceb1ffa 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -31,7 +31,7 @@
         "react-markdown": "^9.0.1",
         "react-redux": "^9.1.2",
         "react-syntax-highlighter": "^15.5.0",
-        "tailwind-merge": "^2.4.0",
+        "tailwind-merge": "^2.5.1",
         "vite": "^5.4.0",
         "web-vitals": "^3.5.2"
       },
@@ -12114,9 +12114,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.4.0.tgz",
-      "integrity": "sha512-49AwoOQNKdqKPd9CViyH5wJoSKsCDjUlzL8DxuGp3P1FsGY36NJDAa18jLZcaHAUUuTj+JB8IAo8zWgBNvBF7A==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.1.tgz",
+      "integrity": "sha512-1zKDdExKvNltulO+J0x/Rqv40xQn78FHsEQVn3rxt8e4HdebRIT6o6zGeLYlGuxd3Efue9Y69qsp8vKwEhuEeg==",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
diff --git a/frontend/package.json b/frontend/package.json
index 783532f10b..515d050a13 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -30,7 +30,7 @@
     "react-markdown": "^9.0.1",
     "react-redux": "^9.1.2",
     "react-syntax-highlighter": "^15.5.0",
-    "tailwind-merge": "^2.4.0",
+    "tailwind-merge": "^2.5.1",
     "vite": "^5.4.0",
     "web-vitals": "^3.5.2"
   },