-

Author: OskarStark

mailer.rst

@@ -1430,7 +1430,6 @@ you have a transport called ``async``, you can route the message there:
                 ->senders(['async']);
         };
 
-<<<<<<< HEAD
 Thanks to this, instead of being delivered immediately, messages will be sent
 to the transport to be handled later (see :ref:`messenger-worker`). Note that
 the "rendering" of the email (computed headers, body rendering, ...) is also
@@ -1463,10 +1462,6 @@ render the email before calling ``$mailer->send($email)``::
 
         $mailer->send($email);
     }
-=======
-Thanks to this, instead of being delivered immediately, messages will be sent to
-the transport to be handled later (see :ref:`messenger-worker`).
->>>>>>> 5.4
 
 You can configure which bus is used to dispatch the message using the ``message_bus`` option.
 You can also set this to ``false`` to call the Mailer transport directly and