Skip to content
Snippets Groups Projects
Commit 88dc34cb authored by SatriaPriambada's avatar SatriaPriambada
Browse files

resolve conflict

parent 1a0d77c2
No related merge requests found
Pipeline #2511 skipped
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment