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

laravel · Feb 2, 2021 · 855c986 · 855c986
1 parent cc940f1
commit 855c986
Showing 1 changed file with 0 additions and 4 deletions.
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()
     {