Fix merge conflict

This commit is contained in:
dinamiko 2022-11-03 12:31:52 +01:00
commit f548c9dfd4
52 changed files with 1260 additions and 170 deletions

View file

@ -156,7 +156,11 @@ class WCGatewayModule implements ModuleInterface {
if ( $c->has( 'wcgateway.url' ) ) {
$assets = new SettingsPageAssets(
$c->get( 'wcgateway.url' ),
$c->get( 'ppcp.asset-version' )
$c->get( 'ppcp.asset-version' ),
$c->get( 'subscription.helper' ),
$c->get( 'button.client_id' ),
$c->get( 'api.shop.currency' ),
$c->get( 'api.shop.country' )
);
$assets->register_assets();
}