Fixed merge conflict

ezimuel · ezimuel · commit 266bc0c92eef · 2019-06-13T16:42:07.000+02:00
diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
@@ -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']);
         }

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ public function __construct(`
`136`	`136`
`137`	`137`	`$connectionParams['client']['curl'][CURLOPT_PORT] = $hostDetails['port'];`
`138`	`138`
`139`		`- if (isset($connectionParams['client']['headers']) {`
	`139`	`+ if (isset($connectionParams['client']['headers'])) {`
`140`	`140`	`$this->headers = $connectionParams['client']['headers'];`
`141`	`141`	`unset($connectionParams['client']['headers']);`
`142`	`142`	`}`