From dff3e7abbc4bcf660b1aae816e534da904e70547 Mon Sep 17 00:00:00 2001
From: David Itehua Xalamihua <davidix1991@gmail.com>
Date: Fri, 6 Jun 2025 19:38:43 -0600
Subject: [PATCH] =?UTF-8?q?modificaci=C3=B3n=20a=20gitignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3e7dd59..26e9012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,28 +1,18 @@
-<<<<<<< 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
-
-/cache/
-!/cache/.gitkeep
-
-/static/uploads/
-!/static/uploads/.gitkeep
->>>>>>> 94e4367c31b015af0d4c0e4325ec73836c63754e
-
+# Ignorar entornos virtuales
+.venv/
+venv/
 
+# Ignorar caché de Python
 __pycache__/
 *.pyc
+
+# Ignorar archivos de caché y logs
 .cache/
 *.log
+
+# Ignorar carpetas de caché y uploads, pero conservar .gitkeep
+/cache/*
+!/cache/.gitkeep
+
+/static/uploads/*
+!/static/uploads/.gitkeep