Merge pull request #22 from gjtorikian/line-clampdown

Fix display removal when preceding line-clamp

Author: gjtorikian

lib/tailwind_merge/config.rb

@@ -1735,6 +1735,7 @@ module Config
         "fvn-figure" => ["fvn-normal"],
         "fvn-spacing" => ["fvn-normal"],
         "fvn-fraction" => ["fvn-normal"],
+        "line-clamp" => ["display", "overflow"],
         "rounded" => [
           "rounded-s",
           "rounded-e",

lib/tailwind_merge/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TailwindMerge
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

test/test_conflicts_across_class_groups.rb

@@ -34,5 +34,8 @@ def test_touch_classes_do_create_conflicts_correctly
     assert_equal("touch-pan-x touch-pan-y touch-pinch-zoom", @merger.merge("touch-manipulation touch-pan-x touch-pan-y touch-pinch-zoom"))
 
     assert_equal("touch-auto", @merger.merge("touch-pan-x touch-pan-y touch-pinch-zoom touch-auto"))
+
+    assert_equal("line-clamp-1", @merger.merge("overflow-auto inline line-clamp-1"))
+    assert_equal("line-clamp-1 overflow-auto inline", @merger.merge("line-clamp-1 overflow-auto inline"))
   end
 end