resolviendo conflicto para rebase

[salamandradevs.site/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 7bfaec85857cd069f5cc69afd92da32d43808c3c..a25e3120d23c436dc5134b2d97fd97800377589f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 \#*#
 public_html/
 .hugo_build.lock
+.idea/
\ No newline at end of file