@@ -2,12 +2,12 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Facade\Ignition\SolutionProviders; |
| 4 | 4 | |
| 5 | -use Throwable; |
|
| 6 | -use ParseError; |
|
| 7 | -use Illuminate\Support\Str; |
|
| 8 | 5 | use Facade\IgnitionContracts\BaseSolution; |
| 9 | 6 | use Facade\IgnitionContracts\HasSolutionsForThrowable; |
| 7 | +use Illuminate\Support\Str; |
|
| 8 | +use ParseError; |
|
| 10 | 9 | use Symfony\Component\Debug\Exception\FatalThrowableError; |
| 10 | +use Throwable; |
|
| 11 | 11 | |
| 12 | 12 | class MergeConflictSolutionProvider implements HasSolutionsForThrowable |
| 13 | 13 | { |
@@ -4,15 +4,15 @@ |
||
| 4 | 4 | |
| 5 | 5 | use Closure; |
| 6 | 6 | use Exception; |
| 7 | -use Throwable; |
|
| 8 | -use Facade\Ignition\Ignition; |
|
| 9 | 7 | use Facade\FlareClient\Report; |
| 10 | -use Laravel\Telescope\Telescope; |
|
| 8 | +use Facade\Ignition\Ignition; |
|
| 11 | 9 | use Facade\Ignition\IgnitionConfig; |
| 12 | -use Illuminate\Contracts\Support\Arrayable; |
|
| 13 | -use Laravel\Telescope\IncomingExceptionEntry; |
|
| 14 | 10 | use Facade\Ignition\Solutions\SolutionTransformer; |
| 11 | +use Illuminate\Contracts\Support\Arrayable; |
|
| 15 | 12 | use Laravel\Telescope\Http\Controllers\HomeController; |
| 13 | +use Laravel\Telescope\IncomingExceptionEntry; |
|
| 14 | +use Laravel\Telescope\Telescope; |
|
| 15 | +use Throwable; |
|
| 16 | 16 | |
| 17 | 17 | class ErrorPageViewModel implements Arrayable |
| 18 | 18 | { |