From: SalamandraDevs <salamandradevs@gmail.com>
Date: Wed, 25 Jan 2023 21:58:58 +0000 (-0500)
Subject: Limpiando rebase
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=df4b6eca0fb69d481b4c96098a8c53450f4e71c1;p=salamandradevs.site%2F.git

Limpiando rebase
---

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)