Fix build

OskarStark · OskarStark · commit 8250dc71f0ce · 2020-12-18T16:20:45.000+01:00
diff --git a/notifier.rst b/notifier.rst
@@ -144,7 +144,6 @@ integration with these chat services:
 
 ==========  ================================  ===========================================================================
 Service     Package                           DSN
-<<<<<<< HEAD
 ==========  ================================  ===========================================================================
 Discord     ``symfony/discord-notifier``      ``discord://TOKEN@default?webhook_id=ID``
 GoogleChat  ``symfony/google-chat-notifier``  ``googlechat://ACCESS_KEY:ACCESS_TOKEN@default/SPACE?threadKey=THREAD_KEY``
