Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Amir Hassani committed Jun 10, 2022
1 parent f89297c commit 43f5be1
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/Coinpaprika/Client.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ class Client
/**
* Client constructor.
*
* @param string|null $cacheDir
* @param \GuzzleHttp\Client $httpClient
* @param string $apiBaseUrl
* @param string|null $cacheDir
* @param \GuzzleHttp\Client|null $httpClient
* @param string|null $apiBaseUrl
*/
public function __construct(
string $cacheDir = null,
Expand Down

0 comments on commit 43f5be1

Please sign in to comment.