CS: try to fix spacing after merge conflict

WordPress · Apr 22, 2024 · 71b0b8f · 71b0b8f
1 parent 4f6b454
commit 71b0b8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/block-supports/typography.php b/lib/block-supports/typography.php
@@ -97,7 +97,7 @@ function gutenberg_apply_typography_support( $block_type, $block_attributes ) {
 	$has_font_weight_support      = $typography_supports['__experimentalFontWeight'] ?? false;
 	$has_letter_spacing_support   = $typography_supports['__experimentalLetterSpacing'] ?? false;
 	$has_line_height_support      = $typography_supports['lineHeight'] ?? false;
-  $has_text_align_support      = $typography_supports['textAlign'] ?? false;
+	$has_text_align_support       = $typography_supports['textAlign'] ?? false;
 	$has_text_columns_support     = $typography_supports['textColumns'] ?? false;
 	$has_text_decoration_support  = $typography_supports['__experimentalTextDecoration'] ?? false;
 	$has_text_transform_support   = $typography_supports['__experimentalTextTransform'] ?? false;

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
@@ -438,8 +438,8 @@ class WP_Theme_JSON_Gutenberg {
 			'fontStyle'       => null,
 			'fontWeight'      => null,
 			'letterSpacing'   => null,
-			'textAlign'       => null,
 			'lineHeight'      => null,
+			'textAlign'       => null,
 			'textColumns'     => null,
 			'textDecoration'  => null,
 			'textTransform'   => null,
@@ -538,7 +538,7 @@ class WP_Theme_JSON_Gutenberg {
 			'fontWeight'      => null,
 			'letterSpacing'   => null,
 			'lineHeight'      => null,
-      'textAlign'       => null,
+			'textAlign'       => null,
 			'textColumns'     => null,
 			'textDecoration'  => null,
 			'textTransform'   => null,