facade /
ignition
@@ -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 | { |
