Skip to content

Commit

Permalink
Merge pull request #18 from derjoachim/master
Browse files Browse the repository at this point in the history
Solve dependency conflict with Laravel 8
  • Loading branch information
RichieMcMullen authored Nov 28, 2020
2 parents 6a46ab5 + dc3aa17 commit 6701b3a
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A laravel package to access data from the Strava API.",
"type": "library",
"require": {
"guzzlehttp/guzzle": "^6.3",
"guzzlehttp/guzzle": "^6.3|^7.0.1",
"illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0|^7.0|^8.0"
},
"autoload": {
Expand All @@ -29,4 +29,4 @@
}
],
"minimum-stability": "dev"
}
}

0 comments on commit 6701b3a

Please sign in to comment.