From 88dc34cba18baee43b2fc3ac855a7e2b2abbf0d0 Mon Sep 17 00:00:00 2001
From: SatriaPriambada <satriapriambada@gmail.com>
Date: Thu, 12 May 2016 14:22:54 +0700
Subject: [PATCH] resolve conflict
---
ppl2/app/Http/routes.php | 4 ----
1 file changed, 4 deletions(-)
diff --git a/ppl2/app/Http/routes.php b/ppl2/app/Http/routes.php
index 159e57e..62f7ae6 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
--
GitLab