Update notifier.rst

christingruber · OskarStark · christingruber · commit b66c696284fd · 2021-01-20T17:19:55.000+01:00
Co-authored-by: Oskar Stark &lt;oskarstark@googlemail.com&gt;
diff --git a/notifier.rst b/notifier.rst
@@ -174,7 +174,11 @@ Zulip       ``symfony/zulip-notifier``        ``zulip://EMAIL:TOKEN@HOST?channel
 
 .. versionadded:: 5.3
 
+<<<<<<< HEAD
     The Gitter and Mercure integrations were introduced in Symfony 5.3.
+=======
+    The Gitter integration was introduced in Symfony 5.3.
+>>>>>>> 53e65280c (Update notifier.rst)
 
 Chatters are configured using the ``chatter_transports`` setting:
 
