elastic
diff --git a/‎tests/Elasticsearch/Tests/BackwardCompatibleTest.php
Lines changed: 0 additions & 171 deletions b/‎tests/Elasticsearch/Tests/BackwardCompatibleTest.php
Lines changed: 0 additions & 171 deletions
diff --git a/‎tests/Elasticsearch/Tests/Connections/ConnectionTest.php
Lines changed: 0 additions & 3 deletions b/‎tests/Elasticsearch/Tests/Connections/ConnectionTest.php
Lines changed: 0 additions & 3 deletions
@@ -453,8 +453,6 @@ public function testParametersAreSent()
         $request = $connection->getLastRequestInfo()['request'];
 
         $this->assertEquals('/?foo=true&baz=false&bar=baz', $request['uri']);
-<<<<<<< HEAD
-=======
     }
 
     public function testPortInUrlWhenLogRequestSuccess()
@@ -550,6 +548,5 @@ public function testPortInLogUrlWhenLogRequestFail()
                 $this->assertStringContainsString('localhost:9200', $row);
             }
         }
->>>>>>> 7.x
     }
 }
Original file line number	Diff line number	Diff line change
`@@ -453,8 +453,6 @@ public function testParametersAreSent()`
`453`	`453`	`$request = $connection->getLastRequestInfo()['request'];`
`454`	`454`
`455`	`455`	`$this->assertEquals('/?foo=true&baz=false&bar=baz', $request['uri']);`
`456`		`-<<<<<<< HEAD`
`457`		`-=======`
`458`	`456`	`}`
`459`	`457`
`460`	`458`	`public function testPortInUrlWhenLogRequestSuccess()`
`@@ -550,6 +548,5 @@ public function testPortInLogUrlWhenLogRequestFail()`
`550`	`548`	`$this->assertStringContainsString('localhost:9200', $row);`
`551`	`549`	`}`
`552`	`550`	`}`
`553`		`->>>>>>> 7.x`
`554`	`551`	`}`
`555`	`552`	`}`