fix conflicts

2023-08-31 12:06:32 -05:00
parent e96d21dd2d 32ecad53a9
commit 17f94e3081
5 changed files with 8 additions and 5 deletions
--- a/config/mail.php
+++ b/config/mail.php
@@ -59,6 +59,7 @@ return [

        'postmark' => [
            'transport' => 'postmark',
+            // 'message_stream_id' => null,
            // 'client' => [
            //     'timeout' => 5,
            // ],