resolviendo conflicto para rebase

diff --git a/.gitignore b/.gitignore
index a25e3120d23c436dc5134b2d97fd97800377589f..be51322d526e3191e51a644102c0156a758c0034 100644 (file)
--- 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)