From 17d0b192a92e3d5b4146f75cce3afca582b526a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 2 Dec 2024 02:29:52 +0000
Subject: [PATCH] Bump tailwind-merge from 2.5.0 to 2.5.5

Bumps [tailwind-merge](https://github.com/dcastil/tailwind-merge) from 2.5.0 to 2.5.5.
- [Release notes](https://github.com/dcastil/tailwind-merge/releases)
- [Commits](https://github.com/dcastil/tailwind-merge/compare/v2.5.0...v2.5.5)

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

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

diff --git a/package-lock.json b/package-lock.json
index fc79f9b7..fadd2a15 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,7 @@
         "react-resizable-panels": "^2.0.20",
         "react-syntax-highlighter": "^15.6.1",
         "react-type-animation": "^3.2.0",
-        "tailwind-merge": "^2.2.0",
+        "tailwind-merge": "^2.5.5",
         "tailwindcss-animate": "^1.0.7",
         "web-tree-sitter": "^0.22.6"
       },
@@ -6970,9 +6970,9 @@
       }
     },
     "node_modules/tailwind-merge": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.0.tgz",
-      "integrity": "sha512-a6Q/isR5XAo9IR7Hjh80BQDkn8PG9ONJpSO/U3vGzdKyKG125lPHNXdiPfeQ5X0EOG0qKlS/0qnxdBYkLlD6tA==",
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.5.tgz",
+      "integrity": "sha512-0LXunzzAZzo0tEPxV3I297ffKZPlKDrjj7NXphC8V5ak9yHC5zRmxnOe2m/Rd/7ivsOMJe3JZ2JVocoDdQTRBA==",
       "license": "MIT",
       "funding": {
         "type": "github",
diff --git a/package.json b/package.json
index a3f9d530..ec4ce2b9 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,7 @@
     "react-resizable-panels": "^2.0.20",
     "react-syntax-highlighter": "^15.6.1",
     "react-type-animation": "^3.2.0",
-    "tailwind-merge": "^2.2.0",
+    "tailwind-merge": "^2.5.5",
     "tailwindcss-animate": "^1.0.7",
     "web-tree-sitter": "^0.22.6"
   },