idevelopment / RingMe

app/Http/Controllers/RolesController.php

Braces +1 added lines, -5 removed lines

@@ -102,8 +102,4 @@
      */
     public function destroy($id)
     {
-        Roles::destroy($id);
-        session()->flash('message', 'Role deleted');
-        return redirect()->back(302);
-    }
-}
+        Roles::destroy($id
\ No newline at end of file

app/Http/routes.php

Braces -11 removed lines

@@ -67,14 +67,3 @@
 // Roles routes
 Route::get('/roles', 'RolesController@index')->name('roles');
 <<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-<<<<<<< HEAD
-Route::post('/roles/create', 'RolesController@store')->name('roles.store');
-=======
-Route::post('/roles', 'RolesController@store')->name('roles.store');
->>>>>>> master
->>>>>>> development
-
-Route::get('/roles/edit/{id}', 'RolesController@edit')->name('roles.edit');
-Route::post('/roles/edit/{id}', 'RolesController@update')->name('roles.update');