.gitignore

@@ -1,16 +1,3 @@
-<<<<<<< HEAD
-# Ignorar archivos de configuración de IDEs
-.venv
-venv
-
-# Ignorar todo en /static/uploads
-/static/uploads/*
-/cache/*
-
-# ¡Pero no ignores el archivo .gitkeep!
-!/static/uploads/.gitkeep
-!/cache/.gitkeep
-=======
 .venv
 venv
 
@@ -19,4 +6,3 @@ venv
 
 /static/uploads/
 !/static/uploads/.gitkeep
->>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e

templates/d_methodology/methodology.html

@@ -10,10 +10,6 @@
 {% block body %}
 
 
-<<<<<<< HEAD
-
-=======
->>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e
 <img src="{{ url_for('static', filename='y_img/methodology/m-02.svg') }}" alt="Metodología" data-aos="fade-up" data-aos-delay="0" data-aos-duration="800">
 
 
@@ -29,10 +25,6 @@
   });
 </script> -->
 
-<<<<<<< HEAD
-  
-=======
->>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e
 {% endblock body %}
 
 {% block js %}

templates/g_login/recover_pswd.html

@@ -39,7 +39,7 @@
 
     <div class="form-footer">
       <a href="{{ url_for('login') }}" class="forgot-password">
-        <i class="bi bi-arrow-left me-1"></i> Regresar al Login
+        <i class="bi bi-arrow-left me-1"></i> Regresar al Log In
       </a>
     </div>
   

templates/z_comps/navbar.html

@@ -80,7 +80,7 @@
         
         <!-- Log In -->
         <li class="nav-item">
-          <a class="nav-link {% if active_page == 'login' %}active{% endif %}" href="{{url_for('login')}}">Login</a>
+          <a class="nav-link {% if active_page == 'login' %}active{% endif %}" href="{{url_for('login')}}">Log In</a>
         </li>