Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06

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

@@ -10,12 +10,12 @@
 <!-- //Banner -->
 
 <!-- Booking -->
-<<<<<<< HEAD
+
 <div class="details agileits w3layouts" style="margin-top: 30px; padding:0px">
-=======
+
 <div class="details agileits w3layouts" style="margin-top: 10px; padding:0px">
 	<br>
->>>>>>> abb3f8ad79338fdd1749e923bb009509d54fe16c
+
 	<div class="container">
 		@if (count($errors) > 0)
 			<div class="alert alert-danger">

resources/views/vendor/adminlte/layouts/partialweb/mainfooter.blade.php

@@ -27,8 +27,8 @@
 					<ul class="agileits w3layouts">
 						<p style="font-size: 20px; color: white;margin-bottom: 10px"> Contact Us </p>
 							<p><span class="glyphicon agileits w3layouts glyphicon-map-marker" aria-hidden="true"></span> Pematang Siantar Balige No.2 Toba Samosir</p>
-							<p><span class="glyphicon agileits w3layouts glyphicon-envelope" aria-hidden="true"></span>paltigcsinaga@gmail.com</p>
-							<p>+6282174161231</p>
+							<p><span class="glyphicon agileits w3layouts glyphicon-envelope" aria-hidden="true"></span> paltigcsinaga@gmail.com</p>
+							<p><span class="glyphicon agileits w3layouts glyphicon-phone" aria-hidden="true"></span> +6282174161231</p>
 					</ul>
 				</div>
 				<div class="clearfix"></div>