Update exception-render-report.stub (#36123)

Dmytro Kulyk · web-flow · commit 855c98657900 · 2021-02-02T08:06:23.000-06:00
diff --git a/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub b/src/Illuminate/Foundation/Console/stubs/exception-render-report.stub
@@ -9,11 +9,7 @@ class DummyClass extends Exception
     /**
      * Report the exception.
      *
-<<<<<<< HEAD
-     * @return bool|void
-=======
      * @return bool|null
->>>>>>> 6.x
      */
     public function report()
     {

Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,7 @@ class DummyClass extends Exception`
`9`	`9`	`/**`
`10`	`10`	`* Report the exception.`
`11`	`11`	`*`
`12`		`-<<<<<<< HEAD`
`13`		`- * @return bool\|void`
`14`		`-=======`
`15`	`12`	`* @return bool\|null`
`16`		`->>>>>>> 6.x`
`17`	`13`	`*/`
`18`	`14`	`public function report()`
`19`	`15`	`{`