From: CrawKatt <man849916@gmail.com>
Date: Wed, 8 Mar 2023 21:33:51 +0000 (-0300)
Subject: resolviendo conflicto para rebase
X-Git-Url: https://git.josue.xyz/?a=commitdiff_plain;h=10ee5265e1786a688ef20c9b171c893837b36b59;p=salamandradevs.site%2F.git

resolviendo conflicto para rebase
---

diff --git a/.gitignore b/.gitignore
index a25e312..be51322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,8 @@
 \#*#
 public_html/
 .hugo_build.lock
-.idea/
\ No newline at end of file
+<<<<<<< HEAD
+.idea/
+=======
+.idea/
+>>>>>>> c7947e0 (borrando articulo descartado)