From db3239a84acc38682f082e5298339f490de8b973 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 5 Feb 2025 15:03:47 +0000 Subject: [PATCH] [LOCAL] Fix build failure in TextAttributes.cpp due to merge conflicts --- .../react/renderer/attributedstring/TextAttributes.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp index 1a607805d66..ec699aafe06 100644 --- a/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp +++ b/packages/react-native/ReactCommon/react/renderer/attributedstring/TextAttributes.cpp @@ -217,10 +217,7 @@ SharedDebugStringConvertibleList TextAttributes::getDebugProps() const { debugStringConvertibleItem("allowFontScaling", allowFontScaling), debugStringConvertibleItem("dynamicTypeRamp", dynamicTypeRamp), debugStringConvertibleItem("letterSpacing", letterSpacing), - debugStringConvertibleItem( - "maxFontSizeMultiplier", - maxFontSizeMultiplier, - textAttributes.maxFontSizeMultiplier), + debugStringConvertibleItem("maxFontSizeMultiplier", maxFontSizeMultiplier) // Paragraph Styles debugStringConvertibleItem("lineHeight", lineHeight),