Ignore .idea directory and update .editorconfig

monounity · Oct 12, 2017 · b0b795b · b0b795b
1 parent dd891f9
commit b0b795b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,13 +1,17 @@
-# editorconfig.org
-root = true
-
-[*]
-indent_style = spaces
-indent_size = 4
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
+# editorconfig.org
+root = true
+
+[*]
+indent_style = spaces
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[package.json]
+indent_style = spaces
+indent_size = 2
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,4 @@ coverage
 node_modules
 npm-debug.log
 tmp
+.idea