diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php index 159e57ef0af1b9c93e52893d817a123ad194e916..62f7ae67d3c058682270955ebfe58ccaaf05d52e 100644 --- a/ppl2/app/Http/routes.php +++ b/ppl2/app/Http/routes.php @@ -51,9 +51,6 @@ Route::post('pendidikan-informal/add', 'PendinFormalController@store'); Route::get('pendidikan-informal', 'PendinFormalController@getAll'); -<<<<<<< HEAD -Route::get('pendidikan-informal/search', 'PendinFormalController@search'); -======= Route::get('pendidikan-informal/search', 'PendinFormalController@search'); Route::get('/institusi', function () { @@ -81,4 +78,3 @@ Route::resource('InstitusiController', 'InstitusiController'); Route::get('/penjadwalan', function () { return view('penjadwalan'); }); ->>>>>>> ba79ded18e3eb51fd92d73ce17dbcb282eda6dc6