From a49d7b958f96e767ee2eb218f85490ef7736056a Mon Sep 17 00:00:00 2001 From: Emili Castells Guasch Date: Tue, 10 Oct 2023 09:46:04 +0200 Subject: [PATCH] Fix merge conflict --- modules/ppcp-wc-gateway/services.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/ppcp-wc-gateway/services.php b/modules/ppcp-wc-gateway/services.php index 3473a4cd0..0044f7ea1 100644 --- a/modules/ppcp-wc-gateway/services.php +++ b/modules/ppcp-wc-gateway/services.php @@ -202,8 +202,10 @@ return array( 'wcgateway.settings' => SingletonDecorator::make( static function ( ContainerInterface $container ): Settings { - $default_button_locations = $container->get( 'wcgateway.button.default-locations' ); - return new Settings( $default_button_locations ); + return new Settings( + $container->get( 'wcgateway.button.default-locations' ), + $container->get( 'wcgateway.settings.dcc-gateway-title.default' ) + ); } ), 'wcgateway.notice.connect' => static function ( ContainerInterface $container ): ConnectAdminNotice {