# Conflicts: # app/Http/Controllers/Admin/CreditProductController.php # app/Http/Controllers/Admin/PaymentController.php # composer.lock # resources/views/admin/payments/index.blade.php # resources/views/admin/store/edit.blade.php # resources/views/store/checkout.blade.php # resources/views/store/index.blade.php