fix conflicts

taylorotwell · taylorotwell · commit 03efea900247 · 2021-03-16T09:21:03.000-05:00
diff --git a/src/Illuminate/Database/DetectsLostConnections.php b/src/Illuminate/Database/DetectsLostConnections.php
@@ -50,6 +50,7 @@ protected function causedByLostConnection(Throwable $e)
             'SSL: Connection timed out',
             'SQLSTATE[HY000]: General error: 1105 The last transaction was aborted due to Seamless Scaling. Please retry.',
             'Temporary failure in name resolution',
+            'SSL: Broken pipe',
         ]);
     }
 }
diff --git a/src/Illuminate/Foundation/Application.php b/src/Illuminate/Foundation/Application.php
@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '8.32.1';
+    const VERSION = '8.33.0';
 
     /**
      * The base path for the Laravel installation.

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ protected function causedByLostConnection(Throwable $e)`
`50`	`50`	`'SSL: Connection timed out',`
`51`	`51`	`'SQLSTATE[HY000]: General error: 1105 The last transaction was aborted due to Seamless Scaling. Please retry.',`
`52`	`52`	`'Temporary failure in name resolution',`
	`53`	`+ 'SSL: Broken pipe',`
`53`	`54`	`]);`
`54`	`55`	`}`
`55`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class Application extends Container implements ApplicationContract, CachesConfig`
`33`	`33`	`*`
`34`	`34`	`* @var string`
`35`	`35`	`*/`
`36`		`- const VERSION = '8.32.1';`
	`36`	`+ const VERSION = '8.33.0';`
`37`	`37`
`38`	`38`	`/**`
`39`	`39`	`* The base path for the Laravel installation.`