amazon-pay-sdk-php icon indicating copy to clipboard operation
amazon-pay-sdk-php copied to clipboard

Published 20 hours ago • verified publisher icon amzn

Improved namespace structure.

Open janhryniukpgs opened this issue 6 years ago • 4 comments

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

janhryniukpgs avatar Feb 11 '19 13:02 janhryniukpgs

Using AmazonPayTest and changing the directory name from tst to test could be a better choice.

biplobice avatar Feb 12 '19 02:02 biplobice

Hi. After making suggested changes this conflicts appears. It would be nice if someone will check settings of repository and tell me, why this conflict appear.

janhryniukpgs avatar Feb 12 '19 07:02 janhryniukpgs

@janhryniukpgs The conflict appears because during your change the ClientTest has been updated. See https://github.com/amzn/amazon-pay-sdk-php/commit/aff849d831b95469d68708ac1bdb316a56896e4c

Your have to rebase your branch onto master, fix the conflicts and force push.

nlubisch avatar Feb 12 '19 07:02 nlubisch

Done.

janhryniukpgs avatar Feb 12 '19 07:02 janhryniukpgs