From ef6a073886a0834a7b1011076093b013ea01e45f Mon Sep 17 00:00:00 2001
From: Ruben Nogueira <ruben.p.nogueira@gmail.com>
Date: Mon, 21 Aug 2023 16:17:02 +0100
Subject: [PATCH] fix: rebase issues

---
 app/bundles/EmailBundle/Helper/MailHelper.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/bundles/EmailBundle/Helper/MailHelper.php b/app/bundles/EmailBundle/Helper/MailHelper.php
index a8bbe8c0474..dff5a50b00b 100644
--- 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]);