fix: rebase issues

PruvoNet · Aug 21, 2023 · ef6a073 · ef6a073
1 parent ebf9124
commit ef6a073
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/app/bundles/EmailBundle/Helper/MailHelper.php b/app/bundles/EmailBundle/Helper/MailHelper.php
@@ -254,7 +254,6 @@ class MailHelper
     private $embedImagesReplaces = [];
 
     public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from = null, $bcc = null)
-
     {
         $this->factory   = $factory;
         $this->mailer    = $mailer;
@@ -270,7 +269,7 @@ public function __construct(MauticFactory $factory, \Swift_Mailer $mailer, $from
         $systemBccEmail     = $factory->getParameter('mailer_default_bcc');
         $systemFromEmail    = $factory->getParameter('mailer_from_email');
         $systemReplyToEmail = $factory->getParameter('mailer_reply_to_email');
-        $systemFromName   = $this->cleanName(
+        $systemFromName     = $this->cleanName(
             $factory->getParameter('mailer_from_name')
         );
         $this->setDefaultFrom($from, [$systemFromEmail => $systemFromName]);