Resolved merge conficts

WordPress · May 29, 2019 · 6241ac4 · 6241ac4
2 parents 97e214b + 80a2569
commit 6241ac4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/template-parts/blocks/custom-panel.php b/template-parts/blocks/custom-panel.php
@@ -16,7 +16,7 @@
 			Field::make( 'text', 'heading', __( 'Panel Heading', 'themewpugph' ) ),
 			Field::make( 'image', 'image', __( 'Panel Image', 'themewpugph' ) ),
 			Field::make( 'textarea', 'content', __( 'Panel Content', 'themewpugph' ) ),
-			Field::make( 'association', 'link', __( 'Panel Link', 'themewpugph' ) )
+            Field::make( 'association', 'link', __( 'Panel Link', 'themewpugph' ) )
 				->set_types(
 					array(
 						array(