From f184226f19c3f0e1b4ee85ec5841b293c5feca41 Mon Sep 17 00:00:00 2001
From: snyk-bot <snyk-bot@snyk.io>
Date: Wed, 6 Nov 2024 06:11:01 +0000
Subject: [PATCH] fix: upgrade tailwind-merge from 2.5.3 to 2.5.4

Snyk has created this PR to upgrade tailwind-merge from 2.5.3 to 2.5.4.

See this package in npm:
tailwind-merge

See this project in Snyk:
https://app.snyk.io/org/tobias-omondi/project/7b0b928e-82f9-4560-95cd-ccabf9f90e67?utm_source=github&utm_medium=referral&page=upgrade-pr
---
 studio/package-lock.json | 15 ++++++++-------
 studio/package.json      |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/studio/package-lock.json b/studio/package-lock.json
index 7044395..e60c389 100644
--- a/studio/package-lock.json
+++ b/studio/package-lock.json
@@ -21,7 +21,7 @@
         "react-scripts": "5.0.1",
         "react-scroll": "^1.9.0",
         "swiper": "^11.1.14",
-        "tailwind-merge": "^2.5.3",
+        "tailwind-merge": "^2.5.4",
         "web-vitals": "^2.1.4"
       },
       "devDependencies": {
@@ -16760,9 +16760,10 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "node_modules/tailwind-merge": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.3.tgz",
-      "integrity": "sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw==",
+      "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==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
@@ -30100,9 +30101,9 @@
       "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="
     },
     "tailwind-merge": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.5.3.tgz",
-      "integrity": "sha512-d9ZolCAIzom1nf/5p4LdD5zvjmgSxY0BGgdSvmXIoMYAiPdAW/dSpP7joCDYFY7r/HkEa2qmPtkgsu0xjQeQtw=="
+      "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=="
     },
     "tailwindcss": {
       "version": "3.4.14",
diff --git a/studio/package.json b/studio/package.json
index 46680a1..1517767 100644
--- a/studio/package.json
+++ b/studio/package.json
@@ -16,7 +16,7 @@
     "react-scripts": "5.0.1",
     "react-scroll": "^1.9.0",
     "swiper": "^11.1.14",
-    "tailwind-merge": "^2.5.3",
+    "tailwind-merge": "^2.5.4",
     "web-vitals": "^2.1.4"
   },
   "scripts": {