Skip to content

Commit

Permalink
Merge branch 'develop' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
danharrin committed Mar 10, 2021
2 parents 1394d9b + 5073d82 commit 9b40b04
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 177 deletions.
5 changes: 2 additions & 3 deletions src/FilamentServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public function boot()
$this->bootLoaders();
$this->bootLivewireComponents();
$this->bootPublishing();

$this->configure();
}

Expand Down Expand Up @@ -195,9 +196,7 @@ protected function registerIcons()

protected function registerProviders()
{
$this->app->booted(function () {
$this->app->register(RouteServiceProvider::class);
});
$this->app->register(RouteServiceProvider::class);
}

protected function mergeConfigFrom($path, $key)
Expand Down
174 changes: 0 additions & 174 deletions src/Sushi.php

This file was deleted.

0 comments on commit 9b40b04

Please sign in to comment.