floatToPixel

primer · Apr 19, 2024 · 67f6dbf · 67f6dbf
1 parent 5843c1a
commit 67f6dbf
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/PrimerStyleDictionary.ts b/src/PrimerStyleDictionary.ts
@@ -23,11 +23,7 @@ import {
   shadowToCss,
   typographyToCss,
   dimensionToRemPxArray,
-<<<<<<< HEAD
   floatToPixel,
-=======
-  convertWithFontSizeToPixel,
->>>>>>> c920fd97 (converting line height to pixel value)
 } from './transformers'
 import {
   javascriptCommonJs,