From 90dbe4af5884e71d983873e90c6b6abee3373a51 Mon Sep 17 00:00:00 2001
From: Avi Flombaum <4515+aviflombaum@users.noreply.github.com>
Date: Mon, 22 Jul 2024 16:21:40 -0400
Subject: [PATCH] Bump tailwind merge

---
 Gemfile                  | 2 +-
 Gemfile.lock             | 8 ++++----
 lib/shadcn-ui/version.rb | 2 +-
 shadcn-ui.gemspec        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Gemfile b/Gemfile
index 39e0af5..c62de41 100644
--- a/Gemfile
+++ b/Gemfile
@@ -82,5 +82,5 @@ gem "redcarpet", "~> 3.6"
 
 gem "rouge", "~> 4.1"
 
-gem "tailwind_merge", "~> 0.7.4"
+gem "tailwind_merge", "~> 0.12"
 gem "meta-tags"
diff --git a/Gemfile.lock b/Gemfile.lock
index f1717ec..b961fb2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    shadcn-ui (0.0.13)
-      tailwind_merge (~> 0.7)
+    shadcn-ui (0.0.14)
+      tailwind_merge (~> 0.12)
 
 GEM
   remote: https://rubygems.org/
@@ -252,7 +252,7 @@ GEM
     sqlite3 (1.6.3-x86_64-linux)
     stimulus-rails (1.2.1)
       railties (>= 6.0.0)
-    tailwind_merge (0.7.4)
+    tailwind_merge (0.12.0)
       lru_redux (~> 1.1)
     tailwindcss-rails (2.0.29-arm64-darwin)
       railties (>= 6.0.0)
@@ -306,7 +306,7 @@ DEPENDENCIES
   sprockets-rails
   sqlite3 (~> 1.4)
   stimulus-rails
-  tailwind_merge (~> 0.7.4)
+  tailwind_merge (~> 0.12)
   tailwindcss-rails
   turbo-rails
   tzinfo-data
diff --git a/lib/shadcn-ui/version.rb b/lib/shadcn-ui/version.rb
index 46ccb1e..f2c3ca6 100644
--- a/lib/shadcn-ui/version.rb
+++ b/lib/shadcn-ui/version.rb
@@ -1,3 +1,3 @@
 module ShadcnUi
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end
diff --git a/shadcn-ui.gemspec b/shadcn-ui.gemspec
index a92c5ed..ad82d32 100644
--- a/shadcn-ui.gemspec
+++ b/shadcn-ui.gemspec
@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "tailwind_merge", "~> 0.7"
+  spec.add_dependency "tailwind_merge", "~> 0.12"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html