facade /
ignition
@@ -2,11 +2,11 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace Facade\Ignition\SolutionProviders; |
| 4 | 4 | |
| 5 | -use Throwable; |
|
| 6 | -use Illuminate\Support\Str; |
|
| 7 | 5 | use Facade\IgnitionContracts\BaseSolution; |
| 8 | 6 | use Facade\IgnitionContracts\HasSolutionsForThrowable; |
| 7 | +use Illuminate\Support\Str; |
|
| 9 | 8 | use Symfony\Component\Debug\Exception\FatalThrowableError; |
| 9 | +use Throwable; |
|
| 10 | 10 | |
| 11 | 11 | class MergeConflictSolutionProvider implements HasSolutionsForThrowable |
| 12 | 12 | { |
