From a87532e63ec45ce390c0d757424fab0caa68c578 Mon Sep 17 00:00:00 2001
From: David Itehua Xalamihua <davidix1991@gmail.com>
Date: Fri, 6 Jun 2025 20:04:13 -0600
Subject: [PATCH] cambios en ignore y secciones soluciones

---
 .gitignore                               | 23 ++++++++++++-----------
 templates/d_methodology/methodology.html |  8 --------
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07274f8..43a3ae0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,15 @@
-# Ignorar entornos virtuales
-.venv/
-venv/
+.venv
+venv
+
+# Ignorar todo en /static/uploads
+/static/uploads/*
+/cache/*
+
+# ¡Pero no ignores el archivo .gitkeep!
+!/static/uploads/.gitkeep
+!/cache/.gitkeep
+
 
 # Ignorar caché de Python
 __pycache__/
-*.pyc
-
-# Ignorar carpetas de caché y uploads, pero conservar .gitkeep
-/cache/*
-!/cache/.gitkeep
-
-/static/uploads/*
-!/static/uploads/.gitkeep
+*.pyc
\ No newline at end of file
diff --git a/templates/d_methodology/methodology.html b/templates/d_methodology/methodology.html
index 43ccb4d..4f18c16 100644
--- a/templates/d_methodology/methodology.html
+++ b/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 %}