resolviendo conflicto para rebase

[salamandradevs.site/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 910c00147feb23b04060d52e0e693ace8e9bcdf8..a25e3120d23c436dc5134b2d97fd97800377589f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *~
 \#*#
 public_html/
+.hugo_build.lock
+.idea/
\ No newline at end of file