search

Sylius / PayPalPlugin

Official integration with PayPal Commerce Platform
37 stars 56 forks source link

[Composer] add orm to conflicts #220

Closed SirDomin closed 3 years ago

SirDomin commented 3 years ago
Q A
Branch? 1.3
Bug fix? yes
New feature? no
Related tickets fixes build
Zales0123 commented 3 years ago

The base of this pull-request was changed, you need fetch and reset your local branch if you want to add new commits to this pull request. Reset before you pull, else commits may become messed-up.

Unless you added new commits (to this branch) locally that you did not push yet, execute git fetch origin && git reset "fix-build-orm" to update your local branch.

Feel free to ask for assistance when you get stuck :+1:

Zales0123 commented 3 years ago

Thank you, @SirDomin! :1st_place_medal: