ntah apapun

resources/views/vendor/adminlte/layouts/master.blade.php

@@ -15,7 +15,7 @@ scratch. This page gets rid of all links and provides the needed markup only.
 
 	@yield('main-content')
 
-@include('adminlte::layouts.partialweb..mainfooter')
-@include('adminlte::layouts.partialweb..scripts')
+@include('adminlte::layouts.partialweb.mainfooter')
+@include('adminlte::layouts.partialweb.scripts')
 </body>
 </html>

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

@@ -15,7 +15,7 @@
 		<!-- Index-Page-CSS --> <link rel="stylesheet" href="css/style.css" 		type="text/css" media="all">
 		<!-- Animate.CSS --> 	<link rel="stylesheet" href="css/animate.css" 		type="text/css" media="all">
 		<!-- Tanggal --> <link rel="stylesheet" href="css/jquery-ui.css" 	type="text/css" media="all">
-	<!-- All css --> <link href="{{ asset('/css/all.css') }}" rel="stylesheet" type="text/css" />
+<!-- 	<!-- All css --> <!-- <link href="{{ asset('/css/all.css') }}" rel="stylesheet" type="text/css" /> -->
 	<!-- //Custom-Stylesheet-Links -->
 
 	<!-- Fonts -->

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

@@ -73,7 +73,3 @@
 	<!-- //Navbar -->
 	<div class="clearfix" style="margin-bottom: 15px;"></div>
 </div>
-<<<<<<< HEAD
-=======
-	
->>>>>>> 71ca9b89f790338b5956eb942bca68989bd853cb