From 5b604f7dbbd080549a424ff85159cb343bda541f Mon Sep 17 00:00:00 2001 From: "Daniel W. Robert" Date: Fri, 9 Sep 2022 16:08:40 -0400 Subject: [PATCH] Remove/resolve items from merge conflict. --- inc/customizer/class-storefront-customizer.php | 8 -------- 1 file changed, 8 deletions(-) diff --git a/inc/customizer/class-storefront-customizer.php b/inc/customizer/class-storefront-customizer.php index e4e5aa2dd..c279389a5 100644 --- a/inc/customizer/class-storefront-customizer.php +++ b/inc/customizer/class-storefront-customizer.php @@ -858,11 +858,7 @@ public function get_css() { * @package storefront * @since 2.0.0 */ -<<<<<<< HEAD $brighten_factor = apply_filters( 'storefront_brighten_factor', 25 ); -======= - $brighten_factor = apply_filters( 'storefront_brighten_factor', 25 ); ->>>>>>> f7bdc6c5 (Add docblocks to hooks used in customizer class.) /** * Filters for darkening color value. * @@ -870,11 +866,7 @@ public function get_css() { * @package storefront * @since 2.0.0 */ -<<<<<<< HEAD $darken_factor = apply_filters( 'storefront_darken_factor', -25 ); -======= - $darken_factor = apply_filters( 'storefront_darken_factor', -25 ); ->>>>>>> f7bdc6c5 (Add docblocks to hooks used in customizer class.) $styles = ' .main-navigation ul li a,