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

[salamandradevs.site/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4488dd3cb07f4d2833a6dfc00fc6936770a44ce9..be51322d526e3191e51a644102c0156a758c0034 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,9 @@
 *~
 \#*#
 public_html/
-<<<<<<< HEAD
 .hugo_build.lock
+<<<<<<< HEAD
+.idea/
 =======
-.hugo_build.lock
->>>>>>> 9b5582b (recreando repositorio)
+.idea/
+>>>>>>> c7947e0 (borrando articulo descartado)