From f4d686c70c22ee19d3f6d0a40ab376ca6e9427b2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 16 Jun 2021 20:16:22 +1000 Subject: [PATCH] Fixes for conflicts --- app/Mail/BouncedEmail.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/app/Mail/BouncedEmail.php b/app/Mail/BouncedEmail.php index 86a793560340..384a33ba5431 100644 --- a/app/Mail/BouncedEmail.php +++ b/app/Mail/BouncedEmail.php @@ -17,18 +17,11 @@ use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -// class BouncedEmail extends Mailable implements ShouldQueue class BouncedEmail extends Mailable { - //use Queueable, SerializesModels; public $invitation; - /** - * Create a new message instance. - * - * @param $invitation - */ public function __construct($invitation) { $this->invitation = $invitation;