Skip to content

Commit

Permalink
bug #163 [HOTFIX] Conflict with the newest amphp/amp (lchrusciel)
Browse files Browse the repository at this point in the history
This PR was merged into the 1.7-dev branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Bug fix?        | no/yes
| New feature?    | no/yes
| BC breaks?      | no/yes
| Deprecations?   | no/yes <!-- don't forget to update the UPGRADE-*.md file -->
| Related tickets | fixes #X, partially #Y, mentioned in #Z
| License         | MIT


Commits
-------

c31dd68 [HOTFIX] Conflict with the newest amphp/amp
  • Loading branch information
lchrusciel authored Apr 30, 2020
2 parents c32ce22 + c31dd68 commit 12b8ef7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
]
},
"conflict": {
"amphp/amp": "2.4.3"
"amphp/amp": "^2.4.3"
},
"extra": {
"branch-alias": {
Expand Down

0 comments on commit 12b8ef7

Please sign in to comment.