Skip to content

Commit

Permalink
Adding blueprint back & fixing conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Harlan Wilton committed Mar 12, 2020
1 parent d54843f commit 56bda8f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
}],
"require": {
"php": "^7.2.5",
"dingo/blueprint": "^0.4",
"illuminate/routing": "^5.5 || ^6.0 || ^7.0",
"illuminate/support": "^5.5 || ^6.0 || ^7.0",
"league/fractal": "^0.17"
Expand Down
3 changes: 0 additions & 3 deletions src/Exception/Handler.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
use Illuminate\Http\Response;
use Dingo\Api\Contract\Debug\ExceptionHandler;
use Dingo\Api\Contract\Debug\MessageBagErrors;
use Exception;
use Illuminate\Contracts\Debug\ExceptionHandler as IlluminateExceptionHandler;
use Illuminate\Http\Response;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use ReflectionFunction;
use Symfony\Component\Console\Output\OutputInterface;
Expand Down

0 comments on commit 56bda8f

Please sign in to comment.