Fix: Remove merge conflict

OskarStark · OskarStark · commit aaff1e01ecf2 · 2023-04-26T09:02:13.000+02:00
diff --git a/notifier.rst b/notifier.rst
@@ -420,25 +420,15 @@ The push channel is used to send notifications to users by using
 :class:`Symfony\\Component\\Notifier\\Texter` classes. Symfony provides
 integration with these push services:
 
-<<<<<<< HEAD
-==============  ====================================  =================================================================================
-Service         Package                               DSN
-==============  ====================================  =================================================================================
-Engagespot      ``symfony/engagespot-notifier``        ``engagespot://API_KEY@default?campaign_name=CAMPAIGN_NAME``
-Expo            ``symfony/expo-notifier``              ``expo://Token@default``
-OneSignal       ``symfony/one-signal-notifier``        ``onesignal://APP_ID:API_KEY@default?defaultRecipientId=DEFAULT_RECIPIENT_ID``
-PagerDuty       ``symfony/pager-duty-notifier``        ``pagerduty://TOKEN@SUBDOMAIN``
-Pushover        ``symfony/pushover-notifier``          ``pushover://USER_KEY:APP_TOKEN@default``
-==============  ====================================  =================================================================================
-=======
 =================  ====================================  =================================================================================
 Service            Package                               DSN
 =================  ====================================  =================================================================================
 `Engagespot`_      ``symfony/engagespot-notifier``        ``engagespot://API_KEY@default?campaign_name=CAMPAIGN_NAME``
 `Expo`_            ``symfony/expo-notifier``              ``expo://Token@default``
 `OneSignal`_       ``symfony/one-signal-notifier``        ``onesignal://APP_ID:API_KEY@default?defaultRecipientId=DEFAULT_RECIPIENT_ID``
+PagerDuty          ``symfony/pager-duty-notifier``        ``pagerduty://TOKEN@SUBDOMAIN``
+Pushover           ``symfony/pushover-notifier``          ``pushover://USER_KEY:APP_TOKEN@default``
 =================  ====================================  =================================================================================
->>>>>>> 6.2
 
 .. versionadded:: 6.1
 
