Añadiendo cambios solicitados

[salamandradevs.site/.git] / .gitignore

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