Resolve merge conflicts

woocommerce · Jun 20, 2023 · 7592eec · 7592eec
1 parent 00cd251
commit 7592eec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/BlockTypes/Checkout.php b/src/BlockTypes/Checkout.php
@@ -274,7 +274,7 @@ function( $acc, $zone ) {
 			// not just the ones that are available for the current cart (which may not exist yet).
 			$payment_methods           = $this->get_enabled_payment_gateways();
 			$formatted_payment_methods = array_reduce(
-				$payment_gateways,
+				$payment_methods,
 				function( $acc, $method ) {
 					$acc[] = [
 						'id'          => $method->id,