X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=.gitignore;h=be51322d526e3191e51a644102c0156a758c0034;hb=HEAD;hp=feb866f7272b5a3b0e0c2dca5a5e68159396f3a0;hpb=b8bbf990ad8ba7b53e5e44f54523b7cedc5ee1ef;p=salamandradevs.site%2F.git

diff --git a/.gitignore b/.gitignore
index feb866f..be51322 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,9 @@
 *~
+\#*#
 public_html/
+.hugo_build.lock
+<<<<<<< HEAD
+.idea/
+=======
+.idea/
+>>>>>>> c7947e0 (borrando articulo descartado)