woocommerce/woocommerce-paypal-payments
2
0
Fork 0
mirror of https://github.com/woocommerce/woocommerce-paypal-payments.git synced 2025-09-06 12:25:15 +08:00
Code Issues Projects Packages Wiki Activity Actions

Fix merge conflict

Browse source
This commit is contained in:
Emili Castells Guasch 2023-10-10 09:46:04 +02:00
parent 460df5829f
commit a49d7b958f
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
modules/ppcp-wc-gateway/services.php
View file

@ -202,8 +202,10 @@ return array(
'wcgateway.settings' => SingletonDecorator::make( 'wcgateway.settings' => SingletonDecorator::make(
static function ( ContainerInterface $container ): Settings { static function ( ContainerInterface $container ): Settings {
$default_button_locations = $container->get( 'wcgateway.button.default-locations' ); return new Settings(
return new Settings( $default_button_locations ); $container->get( 'wcgateway.button.default-locations' ),
$container->get( 'wcgateway.settings.dcc-gateway-title.default' )
);
} }
), ),
'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice { 'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice {