@@ -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'); |
|
@@ -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'); |
|