fix merge

resources/views/vendor/adminlte/layouts/partials/sidebar.blade.php

@@ -54,12 +54,12 @@
               <ul class="treeview-menu" style="display : none;">
                 <li><a href="{{url('daftarKamar')}}"><i class='fa fa-list'></i> <span>Daftar Kamar</span></a></li>
                 <li><a href="{{url('pengajuanHomestay')}}"><i class='fa fa-external-link-square'></i> <span> Pengajuan Homestay </span></a></li>
-<<<<<<< HEAD
+
                 <li><a href="{{url('UpdateHomestay')}}"><i class='fa fa-list'></i> <span>Update Homestay</span></a></li>
                 <li><a href="{{url('ListFeedback')}}"><i class='fa fa-list'></i> <span> Feedback </span></a></li>
-=======
+
                 <li><a href="{{url('updateHomestay')}}"><i class='fa fa-list'></i> <span>Update Homestay</span></a></li>
->>>>>>> 4f242463e2642329a8a7e6496292cc4bbefd1897
+
               </ul>
             </li>
 

routes/web.php

@@ -100,11 +100,10 @@ Route::put('updateHomestay/{id}','OwnerController@updateHomestay');
 
 /*Route::get('UpdateHomestay', function(){
 	return view('adminlte::layouts.owner.UpdateHomestay');
-<<<<<<< HEAD
+
 });
 Route::get('ListFeedback', function(){
 	return view('adminlte::layouts.owner.listfeedback');
 });
-=======
+
 });*/
->>>>>>> 4f242463e2642329a8a7e6496292cc4bbefd1897