Quitando clase index y añadiendo elemento img para la salamandra

[salamandradevs.site/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7bfaec85857cd069f5cc69afd92da32d43808c3c..be51322d526e3191e51a644102c0156a758c0034 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,8 @@
 \#*#
 public_html/
 .hugo_build.lock
+<<<<<<< HEAD
+.idea/
+=======
+.idea/
+>>>>>>> c7947e0 (borrando articulo descartado)