Resolved last conflicts with master

Author: ezimuel

src/Elasticsearch/Endpoints/Cat/Snapshots.php

@@ -18,25 +18,7 @@
  */
 class Snapshots extends AbstractEndpoint
 {
-<<<<<<< HEAD
     protected $repository;
-=======
-    /**
-     * @var string
-     */
-    private $repository;
-
-    public function setRepository(?string $repository): Snapshots
-    {
-        if (isset($repository) !== true) {
-            return $this;
-        }
-
-        $this->repository = $repository;
-
-        return $this;
-    }
->>>>>>> elasticsearch-php/master
 
     public function getURI(): string
     {

src/Elasticsearch/Endpoints/Cat/Templates.php

@@ -18,20 +18,7 @@
  */
 class Templates extends AbstractEndpoint
 {
-<<<<<<< HEAD
     protected $name;
-=======
-    /**
-     * @var string|null
-     */
-    private $name;
-
-    public function setName(?string $name): Templates
-    {
-        $this->name = $name;
-        return $this;
-    }
->>>>>>> elasticsearch-php/master
 
     public function getURI(): string
     {

src/Elasticsearch/Endpoints/Cat/ThreadPool.php

@@ -18,22 +18,7 @@
  */
 class ThreadPool extends AbstractEndpoint
 {
-<<<<<<< HEAD
     protected $thread_pool_patterns;
-=======
-    /**
-     * @var string
-     */
-    protected $threadPoolPatterns;
-
-    public function setThreadPoolPatterns(?string $threadPoolPatterns): ThreadPool
-    {
-        if ($threadPoolPatterns !== null) {
-            $this->threadPoolPatterns = $threadPoolPatterns;
-        }
-        return $this;
-    }
->>>>>>> elasticsearch-php/master
 
     public function getURI(): string
     {