From 5c03d2d085de02ba41e9096106ad0bb718b7aa04 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Fri, 18 Dec 2020 11:41:23 +0100
Subject: [PATCH] Fix merge

---
 .../Notifier/Bridge/Mattermost/MattermostTransport.php       | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php
index a80492a362..18db05cc7a 100644
--- a/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php
+++ b/src/Symfony/Component/Notifier/Bridge/Mattermost/MattermostTransport.php
@@ -87,11 +87,6 @@ final class MattermostTransport extends AbstractTransport
         return $sentMessage;
     }
 
-    protected function getEndpoint(): ?string
-    {
-        return $this->host.($this->port ? ':'.$this->port : '');
-    }
-
     protected function getEndpoint(): ?string
     {
         return rtrim($this->host.($this->port ? ':'.$this->port : '').($this->path ?? ''), '/');