From a9a1de130038fac0f021ad62bcf03e9cdfb76c76 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 20 Dec 2024 21:51:31 +0000
Subject: [PATCH] Bump tailwind_merge from 0.13.1 to 0.14.0

Bumps [tailwind_merge](https://github.com/gjtorikian/tailwind_merge) from 0.13.1 to 0.14.0.
- [Release notes](https://github.com/gjtorikian/tailwind_merge/releases)
- [Changelog](https://github.com/gjtorikian/tailwind_merge/blob/main/CHANGELOG.md)
- [Commits](https://github.com/gjtorikian/tailwind_merge/compare/v0.13.1...v0.14.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>
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 57a037b..23c2a1f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -68,4 +68,4 @@ gem "rbui", github: "rbui-labs/rbui", branch: "main"
 
 gem "phlex-rails", "~> 1.1"
 
-gem "tailwind_merge", "~> 0.13.1"
+gem "tailwind_merge", "~> 0.14.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index bef4715..7182add 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ GEM
     stimulus-rails (1.3.4)
       railties (>= 6.0.0)
     stringio (3.1.1)
-    tailwind_merge (0.13.1)
+    tailwind_merge (0.14.0)
       lru_redux (~> 1.1)
     tailwindcss-rails (3.0.0)
       railties (>= 7.0.0)
@@ -412,7 +412,7 @@ DEPENDENCIES
   solid_queue
   sqlite3 (>= 2.1)
   stimulus-rails
-  tailwind_merge (~> 0.13.1)
+  tailwind_merge (~> 0.14.0)
   tailwindcss-rails (~> 3.0)
   thruster
   turbo-rails