update dotfiles, try to prevent trailing whitespace from being trimme…

…d in markdown files, since it messes up formatting
helpers · May 13, 2013 · 91e36fa · 91e36fa
1 parent 9a65479
commit 91e36fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,10 +1,18 @@
-# editorconfig.org
+; EditorConfig is awesome: http://EditorConfig.org
+
+; top-most EditorConfig file
 root = true
 
+; base rules
 [*]
 indent_style = space
 indent_size = 2
-end_of_line = lf
 charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+; Dont remove trailing whitespace from markdown
+; files since it messes up newlines
+[*.md]
 trim_trailing_whitespace = false
-insert_final_newline = true
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,4 @@
-.npmignore
-/node_modules/
+node_modules
 *.sublime-project
 *.sublime-workspace