Commit e6f8248
authored
[UPMERGE] 1.1 -> 2.0 (#409)
This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/InvoicingPlugin/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.1 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/InvoicingPlugin`
repository.
Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.1 file changed
+0
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | 12 | | |
17 | 13 | | |
18 | 14 | | |
| |||
0 commit comments