From 63242a62c1bd5d3eb19537b7be27c104ef0e5b02 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 17 Jun 2021 18:39:09 +1000
Subject: [PATCH] Fixes for conflicts

---
 app/Providers/MailServiceProvider.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/Providers/MailServiceProvider.php b/app/Providers/MailServiceProvider.php
index 84573620a115..c8b6d178bfa6 100644
--- a/app/Providers/MailServiceProvider.php
+++ b/app/Providers/MailServiceProvider.php
@@ -35,7 +35,9 @@ class MailServiceProvider extends MailProvider
     {
 
         $this->app->singleton('mail.manager', function($app) {
-            return new GmailTransportManager($app);
+            $mailManager = new GmailTransportManager($app);
+            $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
+            return $mailManager;
         });
 
         $this->app->bind('mailer', function ($app) {
@@ -51,11 +53,11 @@ class MailServiceProvider extends MailProvider
 
         });
     
-        $this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
-            $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
-            return $mailManager;
-        });
-                
+        // $this->app->afterResolving('mail.manager', function (GmailTransportManager $mailManager) {
+        //     $mailManager->getSwiftMailer()->registerPlugin($this->app->make(CssInlinerPlugin::class));
+        //     return $mailManager;
+        // });
+
     }
     
     protected function guzzle(array $config): HttpClient