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

satazor · satazor · commit 055ca92454b3 · 2016-01-03T11:02:14.000Z
Conflicts:
	README.md
diff --git a/.editorconfig b/.editorconfig
@@ -10,3 +10,6 @@ insert_final_newline = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[package.json]
+indent_size = 2
