Commit 4dd9227
authored
[UPMERGE] 1.0 -> 2.0 (#277)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/MolliePlugin/blob/1.0/.github/workflows/upmerge_pr.yaml).
**Remember!** The upmerge should always be merged with using `Merge pull
request` button.
In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.0 -m "Resolve conflicts between 1.0 and 2.0"
```
If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/MolliePlugin`
repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.1 file changed
+1
-1
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
24 | | - | |
| 24 | + | |
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| |||
0 commit comments