a

app/Mail/SendEstimateMail.php

@@ -42,9 +42,15 @@ class SendEstimateMail extends Mailable
             'mailable_id' => $this->data['estimate']['id']
         ]);
 
+<<<<<<< HEAD
         $mailContent = $this->from($this->data['from'])
             ->subject($this->data['subject'])
             ->markdown('emails.send.estimate', ['data', $this->data]);
+=======
+        return $this->from($this->data['from'], config('mail.from.name'))
+                    ->subject($this->data['subject'])
+                    ->markdown('emails.send.estimate', ['data', $this->data]);
+>>>>>>> master
 
         if ($this->pdfData) {
             $mailContent->attachData(

app/Mail/SendInvoiceMail.php

@@ -1,6 +1,7 @@
 <?php
 namespace Crater\Mail;
 
+use Config;
 use Crater\Models\EmailLog;
 use Crater\Models\Invoice;
 use Illuminate\Bus\Queueable;
@@ -46,6 +47,7 @@ class SendInvoiceMail extends Mailable
             ->subject($this->data['subject'])
             ->markdown('emails.send.invoice', ['data', $this->data]);
 
+<<<<<<< HEAD
         if ($this->pdfData) {
             $mailContent->attachData(
                 $this->pdfData->output(), 
@@ -54,5 +56,10 @@ class SendInvoiceMail extends Mailable
         }
         
         return $mailContent;
+=======
+        return $this->from($this->data['from'], config('mail.from.name'))
+                    ->subject($this->data['subject'])
+                    ->markdown('emails.send.invoice', ['data', $this->data]);
+>>>>>>> master
     }
 }

app/Mail/SendPaymentMail.php

@@ -43,6 +43,7 @@ class SendPaymentMail extends Mailable
             'mailable_id' => $this->data['payment']['id']
         ]);
 
+<<<<<<< HEAD
         $mailContent = $this->from($this->data['from'])
             ->subject($this->data['subject'])
             ->markdown('emails.send.payment', ['data', $this->data]);
@@ -55,5 +56,11 @@ class SendPaymentMail extends Mailable
         }
         
         return $mailContent;
+=======
+        return $this->from($this->data['from'], config('mail.from.name'))
+                    ->subject($this->data['subject'])
+                    ->markdown('emails.send.payment', ['data', $this->data]);
+
+>>>>>>> master
     }
 }