no message

resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php

@@ -3,13 +3,13 @@
 @section('main-content')
 <!-- Banner -->
 <div class="banner agileits w3layouts">
-		<img src="{{asset('/img/'.$data->gambar)}}" alt="Agileits W3layouts" style="max-height:500px; width:">
-<<<<<<< HEAD
+		<img src="{{asset('/img/'.$data->gambar)}}" alt="Agileits W3layouts" style="max-height:500px; ">
+
 
 	<h1 class="wow agileits w3layouts fadeInDown">{{$data->nama_homestay}}</h1>
-=======
+
 	<h1 class="wow agileits w3layouts fadeInDown">{{$data->namaHomestay}}</h1>
->>>>>>> a8ef892067bb2541a6a1d4eb6447337239f5d4a0
+
 </div>
 <!-- //Banner -->
 
@@ -89,7 +89,7 @@
 			</ul>
 			<img style="width: 450px; margin-top: 10px;" src="{{asset('img/line1.png')}}">
 			<h2 style="margin-bottom: 10px;"> Info Pemilik </h2>
-<<<<<<< HEAD
+
 			<ul style="list-style-type: none;">
 				<li> Pemilik : {{$data->nama}}</li>
 				<li> No Telp : {{$data->no_telepon}} </li>
@@ -98,7 +98,7 @@
 				<li> No Rekening : {{$data->no_rekening}}</li>
 				<li> Avilable Room : {{$avilable}}</li>
 			</ul>
-=======
+
 			<table class="table-condensed" style="font-size: 16px; margin-left: -3px; color: #777;">
 				<tr>
 					<td>Pemilik</td>
@@ -131,7 +131,6 @@
 					<td style="color: #1dc8d9;font-size:30px;">{{$avilable}}</td>
 				</tr>
 			</table>
->>>>>>> a8ef892067bb2541a6a1d4eb6447337239f5d4a0
 		</div>
 		<div class="col-md-6 col-sm-6 cuisines-grids agileits w3layouts cuisines-grids-2  ">
 			<img src="/img/{{$data->gambar}}" alt="Agileits W3layouts">