resolviendo conflicto para rebase

[salamandradevs.site/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4488dd3cb07f4d2833a6dfc00fc6936770a44ce9..a25e3120d23c436dc5134b2d97fd97800377589f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
 *~
 \#*#
 public_html/
-<<<<<<< HEAD
 .hugo_build.lock
-=======
-.hugo_build.lock
->>>>>>> 9b5582b (recreando repositorio)
+.idea/
\ No newline at end of file