Skip to content

Commit

Permalink
PAC-827: fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
kenza-ya committed Oct 16, 2023
2 parents e50b31f + b2077d7 commit dd5fb42
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 21 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,16 @@
* Better error message on PDOException

## Bugfixes

* Make composer dependencies compatible with Magento 2.4.6 (PAC-827)
* Update `symfony/dependency-injection` with version `~6.0`
* Update `symfony/http-kernel` with version `~5.0 ~6.0`
* Update `symfony/configl` with version `~6.0`


* #METSUP-40: fix URL-Suffix in initial-import
* Possibly clean an old cache entry with the correct ID at Multi Store Setup.


* Import-category & Import-category-ee #METSUP-32:
* url rewrites for the multistore store views are updated unintentionally
Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
"license": "MIT",
"require": {
"php": ">=7.3.0",
"techdivision/import": "^17.5.1",
"techdivision/import-cli": "dev-pac-827",
"techdivision/import": "^17.5.2",
"techdivision/import-cli": "^12.3.0",
"techdivision/import-app-simple": "^18.0.3",
"techdivision/import-configuration-jms": "^17.4.1",
"techdivision/import-ee": "^16.0.0",
"techdivision/import-attribute": "^22.0.2",
"techdivision/import-attribute-set": "^17.0.1",
"techdivision/import-customer": "^17.1.1",
"techdivision/import-customer-address": "^17.0.6",
"techdivision/import-category": "^21.0.2",
"techdivision/import-category": "^21.0.3",
"techdivision/import-category-ee": "^22.0.1",
"techdivision/import-product": "^25.2.0",
"techdivision/import-product-msi": "^20.1.0",
Expand Down
36 changes: 18 additions & 18 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dd5fb42

Please sign in to comment.