Merge branch 'master' of github.com:IndigoUnited/node-promptly

Conflicts: README.md
moxystudio · Jan 3, 2016 · 055ca92 · 055ca92
2 parents 9799e33 + e793f0d
commit 055ca92
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[package.json]
+indent_size = 2