resolve merge conflict

This commit is contained in:
David Remer 2020-04-14 08:24:45 +03:00
commit c7aa53a8e4
12 changed files with 157 additions and 36 deletions

View file

@ -17,7 +17,7 @@ return [
},
'wcgateway.gateway' => function (ContainerInterface $container) : WcGateway {
$sessionHandler = $container->get('session.handler');
$cartRepository = $container->get('api.cart-repository');
$cartRepository = $container->get('api.repository.cart');
$endpoint = $container->get('api.endpoint.order');
$orderFactory = $container->get('api.factory.order');
$settingsFields = $container->get('wcgateway.settings.fields');