From 3e3eac17e384cc3c7b291085d15c76bdbabf18e8 Mon Sep 17 00:00:00 2001
From: gnito-org <70450336+gnito-org@users.noreply.github.com>
Date: Mon, 5 Dec 2022 14:38:36 -0400
Subject: [PATCH] [Notifier] Fix merge conflict

---
 notifier.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/notifier.rst b/notifier.rst
index ac9a45b6591..7e51b5f20bd 100644
--- a/notifier.rst
+++ b/notifier.rst
@@ -85,11 +85,8 @@ Nexmo            ``symfony/nexmo-notifier``             Abandoned in favor of Vo
 Octopush         ``symfony/octopush-notifier``          ``octopush://USERLOGIN:APIKEY@default?from=FROM&type=TYPE``
 OrangeSms        ``symfony/orange-sms-notifier``        ``orange-sms://CLIENT_ID:CLIENT_SECRET@default?from=FROM&sender_name=SENDER_NAME``
 OvhCloud         ``symfony/ovh-cloud-notifier``         ``ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME&no_stop_clause=true``
-<<<<<<< HEAD
 RingCentral      ``symfony/ring-central-notifier``      ``ringcentral://API_TOKEN@default?from=FROM``
-=======
 Plivo            ``symfony/plivo-notifier``             ``plivo://AUTH_ID:AUTH_TOKEN@default?from=FROM``
->>>>>>> 80403f278 ([Notifier] Add Plivo bridge)
 Sendberry        ``symfony/sendberry-notifier``         ``sendberry://USERNAME:PASSWORD@default?auth_key=AUTH_KEY&from=FROM``
 Sendinblue       ``symfony/sendinblue-notifier``        ``sendinblue://API_KEY@default?sender=PHONE``
 Sms77            ``symfony/sms77-notifier``             ``sms77://API_KEY@default?from=FROM``