conflict fix

all conflict fixed

resources/views/themes/default1/client/layout/client.blade.php

@@ -36,7 +36,6 @@
             <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
             <script src="https://oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
         <![endif]-->
-
         <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
         @yield('HeadInclude')
     </head>
@@ -123,6 +122,7 @@
                                 <?php
                                 if (is_object($errors)) {
                                     if ($errors->first('email') || $errors->first('password')) {
+
                                         ?> class="sfHover" 
                                             <?php
                                         }
@@ -147,6 +147,7 @@
 <?php goto b; ?>
                                  @endif
                                  <div class="alert alert-danger alert-dismissable">
+
                                     @if(Session::has('error'))
                                     {!! Session::get('error') !!}
                                     @else
@@ -373,6 +374,7 @@
                     </div>
             </footer><!-- #colophon -->
             <!-- jQuery 2.1.1 -->
+
             <script src="{{asset("lb-faveo/js/jquery2.1.1.min.js")}}" type="text/javascript"></script>
             <!-- Bootstrap 3.3.2 JS -->
             <script src="{{asset("lb-faveo/js/bootstrap.min.js")}}" type="text/javascript"></script>