no message

resources/views/vendor/adminlte/layouts/customers/History.blade.php

@@ -17,7 +17,7 @@
 			</thead>
 			<tbody>
 				@foreach($data as $a)
-<<<<<<< HEAD
+
 					<tr class="success">
 						<td>{{$a->no_rekening}}</td>
 						<td>{{$a->nama}}</td>
@@ -46,7 +46,7 @@
 							</form>
 						</td>
 					</tr>
-=======
+
 				<tr class="success">
 					<td>{{$a->noRekening}}</td>
 					<td>{{$a->nama}}</td>
@@ -75,7 +75,7 @@
 						</form>
 					</td>
 				</tr>
->>>>>>> a8ef892067bb2541a6a1d4eb6447337239f5d4a0
+
 				@endforeach
 			</tbody>
 		</table>

resources/views/vendor/adminlte/layouts/owner/ListPengajuanHomestay.blade.php

@@ -29,7 +29,7 @@
         </div>
         <!-- /.info-box-content -->
       </div>
-<<<<<<< HEAD
+
       <table class="table table-striped">
         <tr>
           <th>Pengaju</th>
@@ -53,7 +53,6 @@
         @endforeach
       </table>
 
-=======
       <!-- /.info-box -->
       <br>
     </div>
@@ -77,7 +76,7 @@
       </tr>
       @endforeach
     </table>
->>>>>>> a8ef892067bb2541a6a1d4eb6447337239f5d4a0
+
   </div>
 </div>
 @endsection

resources/views/vendor/adminlte/layouts/owner/profil.blade.php

@@ -5,7 +5,7 @@
 @endsection
 
 @section('main-content')
-<<<<<<< HEAD
+
     <div class="container-fluid spark-screen">
         <div class="row">
             <div class="col-md-10 col-md-offset-1">
@@ -55,7 +55,7 @@
                       </a>
                   </div>
                 </div>
-=======
+
 <div class="container-fluid spark-screen">
   <div class="row">
     <div class="col-md-10 col-md-offset-1">
@@ -96,7 +96,7 @@
                   <td>{{$data->noRekening}}</td>
                 </tr>
               </table>
->>>>>>> a8ef892067bb2541a6a1d4eb6447337239f5d4a0
+
             </div>
           </div>
         </div>
@@ -109,4 +109,8 @@
     </div>
   </div>
 </div>
+
 @endsection
+            </div>
+            </div>
+        </div>
\ No newline at end of file

resources/views/vendor/adminlte/layouts/owner/updateProfil.blade.php

@@ -26,8 +26,7 @@
           </div>
           @endif
 
-<<<<<<< HEAD
-                            <form action="{{url('profileupdate/'.$data->id)}}" method="post" enctype="multipart/form-data">
+              <form action="{{url('profileupdate/'.$data->id)}}" method="post" enctype="multipart/form-data">
                                 <input type="hidden" name="_method" value="PUT">
                                  {{csrf_field()}}
                                 <label>Nama</label>
@@ -48,7 +47,7 @@
                             </form>
                     </div>
                 </div>
-=======
+
           <form action="{{url('profileupdate/'.$data->id)}}" method="post" enctype="multipart/form-data">
             <input type="hidden" name="_method" value="PUT">
             {{csrf_field()}}
@@ -66,7 +65,7 @@
             <input type="file" name="picture" id="picture" class="form-control"><br>
             <div class="form-group" align="right">
               <input type="submit" class="btn btn-primary" value="simpan">
->>>>>>> a8ef892067bb2541a6a1d4eb6447337239f5d4a0
+
             </div>
           </form>
         </div>