rebase fixes

primer · Jan 27, 2021 · 977d0df · 977d0df
1 parent b1b96a2
commit 977d0df
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/lib/primer/classify.rb b/lib/primer/classify.rb
@@ -79,10 +79,7 @@ class Classify
     }.freeze
     BORDER_KEYS = [:border, :border_color].freeze
     BORDER_MARGIN_KEYS = [:border_top, :border_bottom, :border_left, :border_right].freeze
-<<<<<<< HEAD
     BORDER_RADIUS_KEY = :border_radius
-=======
->>>>>>> c5fb29f (38 allocations)
     TYPOGRAPHY_KEYS = [:font_size].freeze
     VALID_KEYS = (
       CONCAT_KEYS +