vict3459
/
Ekapp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of https://github.com/sebathefox/skolehjem-webapp into master 

 Conflicts:
	skolehjem/database/seeds/RoleSeeder.php
This commit is contained in:
frederikpyt 2020-08-31 09:38:20 +02:00
parent c6c54996b5 3856541790
commit 0418805b7c
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
skolehjem/app/Http/Controllers/MenuPlanController.php
View File

@ -3,7 +3,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use App; use App;
use App\ExternalLink;
use App\MenuPlan; use App\MenuPlan;
use App\News; use App\News;
use App\User; use App\User;

1
skolehjem/routes/web.php
View File

@ -89,7 +89,6 @@ Route::resource("userevents", "UserEventController");
Route::resource("washing-machines", "WashingMachineController"); Route::resource("washing-machines", "WashingMachineController");
Route::resource("washing-reservations", "WashingReservationController"); Route::resource("washing-reservations", "WashingReservationController");
Route::resource("feedbacks", "FeedbackController"); Route::resource("feedbacks", "FeedbackController");
Route::resource("external-links", "ExternalLinkController");
Route::resource("resource-extensions", "ResourceExtensionController"); Route::resource("resource-extensions", "ResourceExtensionController");
Route::resource("resource-categories", "ResourceCategoryController"); Route::resource("resource-categories", "ResourceCategoryController");
Route::resource("roles", "RolesController"); Route::resource("roles", "RolesController");