Closed saadidrees711 closed 3 years ago
Conflict has been resolved in the latest push. Please check now.
On Fri, May 7, 2021 at 6:31 PM Anders Jenbo @.***> wrote:
@AJenbo commented on this pull request. In Test/Integration Test/cypress/integration/PageObjects/objects.js https://github.com/AltaPay/plugin-magento2/pull/32#discussion_r628212251 : +<<<<<<< HEAD + +======= you have a conflict — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/AltaPay/plugin-magento2/pull/32#pullrequestreview-654460276, or unsubscribe https://github.com/notifications/unsubscribe-auth/ATBRRRMD6YWQGCZHHLHQT2DTMPTTTANCNFSM43ZQLPOA .
In Test/Integration Test/cypress/integration/PageObjects/objects.js https://github.com/AltaPay/plugin-magento2/pull/32#discussion_r628212251 :
+<<<<<<< HEAD + +=======
you have a conflict
— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/AltaPay/plugin-magento2/pull/32#pullrequestreview-654460276, or unsubscribe https://github.com/notifications/unsubscribe-auth/ATBRRRMD6YWQGCZHHLHQT2DTMPTTTANCNFSM43ZQLPOA .
Conflict has been resolved in the latest push. Please check now.
On Fri, May 7, 2021 at 6:31 PM Anders Jenbo @.***> wrote: