Remove/resolve items from merge conflict.

woocommerce · Sep 9, 2022 · 5b604f7 · 5b604f7
1 parent 4fab27f
commit 5b604f7
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/inc/customizer/class-storefront-customizer.php b/inc/customizer/class-storefront-customizer.php
@@ -858,23 +858,15 @@ 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.
 			 *
 			 * @param int Numerical value for darken amount.
 			 * @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,