resolved merge conflicts in .gitignore

vlead · Sep 28, 2017 · bcc8063 · bcc8063
1 parent c291bd2
commit bcc8063
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,5 @@
 # OS generated files #
 ######################
-.#*
 *.DS_Store
 *.DS_Store?
 ._*
@@ -28,4 +27,5 @@ sitemap*
 lint_output
 literate-tools
 src/sitemap.org
-elisp
+elisp
+