Skip to content

Commit

Permalink
Solved composer suggest merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
WyriHaximus committed Nov 8, 2017
2 parents 4a61948 + 58e3814 commit 01da14f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
"phpunit/phpunit": "~4.8"
},
"suggest": {
"ext-libevent": ">=0.1.0",
"ext-event": "~1.0",
"ext-libev": "*",
"ext-libevent": ">=0.1.0 for LibEventLoop and PHP5 only",
"ext-event": "~1.0 for ExtEventLoop",
"ext-libev": "for LibEvLoop",
"ext-pcntl": "For signals support when using the stream_select loop"
},
"autoload": {
Expand Down

0 comments on commit 01da14f

Please sign in to comment.