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

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

@@ -24,11 +24,14 @@
 				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
 					<input type="text" class="text wow agileits w3layouts slideInLeft" name="jumlah_kamar" placeholder="Jumlah Kamar" required="" style="background-color: white; color: black">
 				</div>
+<<<<<<< HEAD
 
 				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft" style="margin-top: 10px;">
 					<button class="btn btn-success " >BOOK NOW</button>
 
 
+=======
+>>>>>>> 1b1aa66ed77eecba26c79b08a445f59576a1ca97
 				<div class="col-md-3 col-sm-3 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
 
 					<a href="{{url('history')}}" id="book" >
@@ -36,7 +39,15 @@
 					</a>
 
 					<input type="submit" class="more_btn wow agileits w3layouts slideInLeft" value="Book Now">
-
+<<<<<<< HEAD
+
+=======
+<<<<<<< HEAD
+=======
+>>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
+>>>>>>> 36fc9a9037d0772bcfa4c52323fe8a6c39550bd5
+>>>>>>> 0f3eed02f22695fdd7fc61c41b915d902aeca1fc
+>>>>>>> 1b1aa66ed77eecba26c79b08a445f59576a1ca97
 				</div>
 			</form>
 		</div>
@@ -112,6 +123,7 @@
 <div class="details agileits w3layouts">
 	<div class="container">
 		<div class="col-md-6 col-sm-6 agileits w3layouts contact-grid contact-grid-2 wow slideInLeft">
+<<<<<<< HEAD
 
 			<h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
 			<form action="#" method="post" style="margin-bottom: 25px;">
@@ -119,6 +131,12 @@
 			<h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
 			<form action ="#" method="post" style="margin-bottom: 25px;">
 
+=======
+			<h2 style="margin-bottom: 10px;"> Kritik dan Saran</h2>
+			<form action="#" method="post" style="margin-bottom: 25px;">
+			<h2 style="margin-bottom: 10px;"> Kritik dan Saran </h2>
+			<form action ="#" method="post" style="margin-bottom: 25px;">
+>>>>>>> 1b1aa66ed77eecba26c79b08a445f59576a1ca97
 				<input type="text" class="text wow agileits w3layouts slideInLeft" name="Name" placeholder="Name" required="">
 				<input type="text" class="text wow agileits w3layouts slideInLeft" name="Email" placeholder="Email" required="">
 				<textarea name="Message" class="wow agileits w3layouts slideInLeft" placeholder="Message" required=""></textarea>
@@ -139,12 +157,15 @@
 	document.getElementById('book').onclick = function(){
 		swal("Good job!", "You clicked the button!", "success");};
 	</script>
+<<<<<<< HEAD
 
 	@endsection
 </div>
 
+=======
+</div>
+>>>>>>> 1b1aa66ed77eecba26c79b08a445f59576a1ca97
 
-	
 
 	<script>
 		document.querySelector('  ').onclick = function(){
@@ -175,4 +196,17 @@
 				});
 			};
 
+<<<<<<< HEAD
+		</script>
+=======
 		</script>
+<<<<<<< HEAD
+=======
+<<<<<<< HEAD
+	@endsection
+=======
+>>>>>>> f3f2287d7c86a7c8efc0162c242d120bfcaf820a
+
+>>>>>>> 36fc9a9037d0772bcfa4c52323fe8a6c39550bd5
+>>>>>>> 0f3eed02f22695fdd7fc61c41b915d902aeca1fc
+>>>>>>> 1b1aa66ed77eecba26c79b08a445f59576a1ca97