Merge remote-tracking branch 'origin/2.x' into 2.x

tomirons · tomirons · commit 146b8b425010 · 2021-02-25T19:37:10.000-05:00
diff --git a/src/Mailables/ActionMailable.php b/src/Mailables/ActionMailable.php
@@ -8,8 +8,8 @@
 
 class ActionMailable extends TuxedoMessage
 {
-    use HasAction,
-        HasLine;
+    use HasAction;
+    use HasLine;
 
     /**
      * The Markdown template for the message (if applicable).
diff --git a/src/Mailables/InvoiceMailable.php b/src/Mailables/InvoiceMailable.php
@@ -9,8 +9,8 @@
 
 class InvoiceMailable extends TuxedoMessage
 {
-    use HasAction,
-        HasLine;
+    use HasAction;
+    use HasLine;
 
     /**
      * The Markdown template for the message (if applicable).

Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`
`9`	`9`	`class ActionMailable extends TuxedoMessage`
`10`	`10`	`{`
`11`		`- use HasAction,`
`12`		`- HasLine;`
	`11`	`+ use HasAction;`
	`12`	`+ use HasLine;`
`13`	`13`
`14`	`14`	`/**`
`15`	`15`	`* The Markdown template for the message (if applicable).`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@`
`9`	`9`
`10`	`10`	`class InvoiceMailable extends TuxedoMessage`
`11`	`11`	`{`
`12`		`- use HasAction,`
`13`		`- HasLine;`
	`12`	`+ use HasAction;`
	`13`	`+ use HasLine;`
`14`	`14`
`15`	`15`	`/**`
`16`	`16`	`* The Markdown template for the message (if applicable).`