Merge

resources/views/auth/login.blade.php

@@ -63,10 +63,6 @@
                                 <button type="submit" class="btn btn-enter">
                                     {{ __('agendamento.login') }}
                                 </button>
-<<<<<<< HEAD
-
-=======
->>>>>>> 9f9046eedf5ca6cf5a6ac9f6fd3d9ab219337622
                             </div>
                         </div>
 

resources/views/components/page.blade.php

@@ -2,15 +2,12 @@
     <div class="row justify-content-center">
         <div class="col-md-{{$col}}">
             <div class="card">
-<<<<<<< HEAD
+
                 <div class="imaLogos">
                     <img src="{!! asset('img/Logo governo_150.png') !!}">
                 </div>
-            <!-- <div class="card-header">{{ $page }}</div> -->
+            {{-- <div class="card-header">{{ $page }}</div> --}}
 
-=======
-            <div class="card-header">{{ $page }}</div>
->>>>>>> 9f9046eedf5ca6cf5a6ac9f6fd3d9ab219337622
                 <div class="card-body">
                    {{ $slot }}
                 </div>