Skip to content

Commit

Permalink
Merge branch 'master' into remove-kedge
Browse files Browse the repository at this point in the history
  • Loading branch information
JPinkney authored May 31, 2019
2 parents c640cce + 45a056e commit bd3dee9
Show file tree
Hide file tree
Showing 59 changed files with 9,668 additions and 9,754 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Tab indentation
[*]
indent_style = tab
indent_style = space
indent_size = 4
trim_trailing_whitespace = true
trim_trailing_whitespace = false

[{.travis.yml,npm-shrinkwrap.json,package.json}]
indent_style = space
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

# YAML Language Server

Supports JSON Schema 7 and below.

## Features

1. YAML validation:
Expand Down
Loading

0 comments on commit bd3dee9

Please sign in to comment.