Skip to content

Commit

Permalink
Merge 0e7bb35 into 7337825
Browse files Browse the repository at this point in the history
  • Loading branch information
emyann committed Apr 28, 2018
2 parents 7337825 + 0e7bb35 commit a025cb5
Show file tree
Hide file tree
Showing 7 changed files with 9,451 additions and 4,995 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ root = true

[*]
indent_style = space
indent_size = 4
indent_size = 2
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"editor.formatOnSave": true,
"prettier.singleQuote": true,
"prettier.tabWidth": 2
}

0 comments on commit a025cb5

Please sign in to comment.