From df4b6eca0fb69d481b4c96098a8c53450f4e71c1 Mon Sep 17 00:00:00 2001
From: SalamandraDevs <salamandradevs@gmail.com>
Date: Wed, 25 Jan 2023 16:58:58 -0500
Subject: [PATCH] Limpiando rebase

---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4488dd3..7bfaec8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 *~
 \#*#
 public_html/
-<<<<<<< HEAD
 .hugo_build.lock
-=======
-.hugo_build.lock
->>>>>>> 9b5582b (recreando repositorio)
-- 
2.25.1