Skip to content

Commit

Permalink
run update
Browse files Browse the repository at this point in the history
  • Loading branch information
jonschlinkert committed Nov 29, 2017
1 parent 423ed93 commit f331dc1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
9 changes: 5 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
# http://editorconfig.org/
root = true

[*]
indent_style = space
end_of_line = lf
charset = utf-8
end_of_line = lf
indent_size = 2
trim_trailing_whitespace = true
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[{**/{actual,fixtures,expected,templates}/**,*.md}]
trim_trailing_whitespace = false
insert_final_newline = false
insert_final_newline = false
5 changes: 0 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
{
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true
},

"env": {
"browser": false,
"es6": true,
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# always ignore files
*.DS_Store
.idea
*.sublime-*

# test related, or directories generated by tests
Expand All @@ -25,3 +26,4 @@ vendor
temp
tmp
TODO.md
package-lock.json
10 changes: 6 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: false
os:
- linux
- osx
language: node_js
node_js:
- node
- '9'
- '8'
- '7'
- '6'
- '5'
- '4'
matrix:
allow_failures:
- node_js: '0.12'
- node_js: '0.10'
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2017 Jon Schlinkert
Copyright (c) 2017, Jon Schlinkert.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down

0 comments on commit f331dc1

Please sign in to comment.