conflict fix

all conflict fixed
2016-08-03 21:19:11 +05:30
parent ffa56a43cb e90c764c88
commit 18af857291
9 changed files with 23 additions and 219 deletions
--- a/resources/views/themes/default1/layouts/login.blade.php
+++ b/resources/views/themes/default1/layouts/login.blade.php
@@ -56,6 +56,7 @@
    <script src="{{asset("lb-faveo/js/ajax-jquery.min.js")}}" type="text/javascript"></script>

    <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>
+
    <!-- iCheck -->
    <script src="{{asset("lb-faveo/plugins/iCheck/icheck.min.js")}}" type="text/javascript"></script>