Borrando archivo en conflicto de emacs

[salamandradevs.site/.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index feb866f7272b5a3b0e0c2dca5a5e68159396f3a0..910c00147feb23b04060d52e0e693ace8e9bcdf8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *~
+\#*#
 public_html/