mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for conflicts
This commit is contained in:
parent
36f6cbbcc9
commit
f4d686c70c
@ -17,18 +17,11 @@ use Illuminate\Contracts\Queue\ShouldQueue;
|
|||||||
use Illuminate\Mail\Mailable;
|
use Illuminate\Mail\Mailable;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
|
||||||
// class BouncedEmail extends Mailable implements ShouldQueue
|
|
||||||
class BouncedEmail extends Mailable
|
class BouncedEmail extends Mailable
|
||||||
{
|
{
|
||||||
//use Queueable, SerializesModels;
|
|
||||||
|
|
||||||
public $invitation;
|
public $invitation;
|
||||||
|
|
||||||
/**
|
|
||||||
* Create a new message instance.
|
|
||||||
*
|
|
||||||
* @param $invitation
|
|
||||||
*/
|
|
||||||
public function __construct($invitation)
|
public function __construct($invitation)
|
||||||
{
|
{
|
||||||
$this->invitation = $invitation;
|
$this->invitation = $invitation;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user