@@ -4,7 +4,6 @@ |
||
4 | 4 | |
5 | 5 | use App\Departments; |
6 | 6 | use Illuminate\Http\Request; |
7 | - |
|
8 | 7 | use App\Http\Requests; |
9 | 8 | |
10 | 9 | /** |
@@ -5,10 +5,7 @@ |
||
5 | 5 | use App\Departments; |
6 | 6 | use App\User; |
7 | 7 | use App\Roles; |
8 | - |
|
9 | 8 | use Chrisbjr\ApiGuard\Models\ApiKey; |
10 | -use Illuminate\Http\Request; |
|
11 | - |
|
12 | 9 | use App\Http\Requests; |
13 | 10 | use Bouncer; |
14 | 11 |
@@ -67,14 +67,3 @@ |
||
67 | 67 | // Roles routes |
68 | 68 | Route::get('/roles', 'RolesController@index')->name('roles'); |
69 | 69 | <<<<<<< HEAD |
70 | -Route::post('/roles/create', 'RolesController@store')->name('roles.store'); |
|
71 | -======= |
|
72 | -<<<<<<< HEAD |
|
73 | -Route::post('/roles/create', 'RolesController@store')->name('roles.store'); |
|
74 | -======= |
|
75 | -Route::post('/roles', 'RolesController@store')->name('roles.store'); |
|
76 | ->>>>>>> master |
|
77 | ->>>>>>> development |
|
78 | - |
|
79 | -Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit'); |
|
80 | -Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update'); |