no message

f2e3c65c · Palti Sinaga · f3116204 · f2e3c65c
Commit f2e3c65c authored May 23, 2017 by Palti Sinaga
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

web.php routes/web.php +1 -3

No files found.
--- a/routes/web.php
+++ b/routes/web.php
@@ -100,8 +100,6 @@ Route::put('updateHomestay/{id}','OwnerController@updateHomestay');

 /*Route::get('UpdateHomestay', function(){
 	return view('adminlte::layouts.owner.UpdateHomestay');
-<<<<<<< HEAD
-<<<<<<< HEAD
+
 });*/
 Route::get('listFeedback','OwnerController@feddback');
-