From 3c2dcc408df5cdd5e621c426edb1a7f20a3538d5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 24 Dec 2024 05:29:05 +0000
Subject: [PATCH] chore(deps): bump tailwind-merge from 2.5.4 to 2.6.0 in
 /frontend

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.5.4 to 2.6.0.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.5.4...v2.6.0)

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

Signed-off-by: dependabot[bot] <support@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 9f8176b5..ee9e5ba0 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -39,7 +39,7 @@
         "react-syntax-highlighter": "^15.6.1",
         "remark-gfm": "^4.0.0",
         "sirv-cli": "^3.0.0",
-        "tailwind-merge": "^2.5.4",
+        "tailwind-merge": "^2.6.0",
         "vite": "^5.4.9",
         "web-vitals": "^3.5.2",
         "ws": "^8.18.0"
@@ -23017,9 +23017,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "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==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
+      "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
diff --git a/frontend/package.json b/frontend/package.json
index 51ff6768..f1840f6e 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -38,7 +38,7 @@
     "react-syntax-highlighter": "^15.6.1",
     "remark-gfm": "^4.0.0",
     "sirv-cli": "^3.0.0",
-    "tailwind-merge": "^2.5.4",
+    "tailwind-merge": "^2.6.0",
     "vite": "^5.4.9",
     "web-vitals": "^3.5.2",
     "ws": "^8.18.0"