From 25964088af7512468f4349afe4a8ec2e16fa4b1e Mon Sep 17 00:00:00 2001
From: Jessica_Faro <jessica.faro@souunit.com.br>
Date: Wed, 15 Oct 2025 20:30:04 -0300
Subject: [PATCH] =?UTF-8?q?resolu=C3=A7=C3=A3o=20de=20erros?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/App.js b/src/App.js
index 2135c6b8..0335710a 100644
--- a/src/App.js
+++ b/src/App.js
@@ -9,13 +9,12 @@ import LandingPage from './pages/LandingPage';
 import PerfilFinanceiro from "./perfis/perfil_financeiro/PerfilFinanceiro";
 import Perfiladm from "./perfis/Perfil_adm/Perfiladm";
 import PerfilMedico from "./perfis/Perfil_medico/PerfilMedico";
-<<<<<<< HEAD
+
+// COMBINADO: Importações de ambas as versões
 import PerfilPaciente from "./perfis/Perfil_paciente/Perfilpaciente"
-=======
 import ProfilePage from "./pages/ProfilePage";
 import Header from "./components/Header/Header";
 
->>>>>>> perfillogin
 // Componentes globais de acessibilidade
 import VlibrasWidget from "./components/VlibrasWidget";
 
@@ -37,15 +36,15 @@ function App() {
         <Route path="/financeiro/*" element={<PerfilFinanceiro />} />
         <Route path="/medico/*" element={<PerfilMedico />} />
         <Route path="/admin/*" element={<Perfiladm />} />
-<<<<<<< HEAD
+
+        {/* COMBINADO: Rotas de ambas as versões */}
         <Route path="/paciente/*" element={<PerfilPaciente />} />
-=======
         <Route path="/perfil" element={<ProfilePage />} />
->>>>>>> perfillogin
+        
         <Route path="*" element={<h2>Página não encontrada</h2>} />
       </Routes>
     </Router>
   );
 }
 
-export default App;
+export default App;
\ No newline at end of file