Skip to content

Commit

Permalink
Merge pull request #1216 from alexander-schranz/patch-3
Browse files Browse the repository at this point in the history
Remove conflicts to hoa packages
  • Loading branch information
goetas authored Jun 15, 2020
2 parents c3e1977 + ee1f417 commit 8ae2f37
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@
"doctrine/coding-standard": "^5.0",
"doctrine/persistence": "^1.3.3|^2.0|^3.0"
},
"conflict": {
"hoa/core": "*",
"hoa/consistency": "<1.17.05.02",
"hoa/iterator": "<2.16.03.15"
},
"autoload": {
"psr-4": {
"JMS\\Serializer\\": "src/"
Expand Down

0 comments on commit 8ae2f37

Please sign in to comment.