From 37fe3747e988f6639b9eae51ee7792d9da9f8260 Mon Sep 17 00:00:00 2001
From: alissonalbuquerque <alissonalbuquerque.dev@gmail.com>
Date: Fri, 3 Feb 2023 09:33:36 -0300
Subject: [PATCH] correcoes de merge

---
 resources/views/user/update_perfil.blade.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/resources/views/user/update_perfil.blade.php b/resources/views/user/update_perfil.blade.php
index 8211ee3..f683e04 100644
--- a/resources/views/user/update_perfil.blade.php
+++ b/resources/views/user/update_perfil.blade.php
@@ -9,15 +9,9 @@
 @endsection
 
 @section('nav')
-<<<<<<< HEAD
-@include('layouts.navigation', [
-'index_menu' => $index_menu,
-])
-=======
     @include('layouts.navigation', [
         'menu' => $menu
     ])
->>>>>>> updates_deploy
 @endsection
 
 @php
@@ -62,10 +56,6 @@
                 </li>
             </ul>
         </div>
-        <div class="tab-pane fade" id="profile" role="tabpanel" aria-labelledby="profile-tab">
-            <form method="post" action="{{ route('update_password') }}">
-                @csrf
-                @method('POST')
 
         <!-- Panels -->
         <div id="tab-containers" class="tab-content">
-- 
GitLab