Skip to content

Commit 518ba6e

Browse files
committed
Resolve conflict in changelog during upmerge
2 parents e6e85b7 + 1e55e58 commit 518ba6e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

CHANGELOG-1.1.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@
1717
- [#340](https://github.com/Sylius/RefundPlugin/issues/340) Drop support for Symfony 5.3 ([@GSadee](https://github.com/GSadee))
1818
- [#343](https://github.com/Sylius/RefundPlugin/issues/343) Resolve added to parameter to make usage of proper path possible ([@TheMilek](https://github.com/TheMilek))
1919
- [#345](https://github.com/Sylius/RefundPlugin/issues/345) New PDF layout ([@kulczy](https://github.com/kulczy))
20+
- [#346](https://github.com/Sylius/RefundPlugin/issues/346) [Maintenance] Support stable Sylius v1.11.0 ([@GSadee](https://github.com/GSadee))

0 commit comments

Comments
 (0)