Skip to content

Commit

Permalink
Fixed merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
ezimuel committed Jun 13, 2019
1 parent 56a7f3d commit 266bc0c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/Elasticsearch/Connections/Connection.php
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ public function __construct(

$connectionParams['client']['curl'][CURLOPT_PORT] = $hostDetails['port'];

if (isset($connectionParams['client']['headers']) {
if (isset($connectionParams['client']['headers'])) {
$this->headers = $connectionParams['client']['headers'];
unset($connectionParams['client']['headers']);
}
Expand Down

0 comments on commit 266bc0c

Please sign in to comment.