Skip to content

Commit

Permalink
run update
Browse files Browse the repository at this point in the history
  • Loading branch information
jonschlinkert committed Jul 1, 2016
1 parent 9a1efe1 commit b7bd0aa
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 17 deletions.
4 changes: 2 additions & 2 deletions .editorconfig
Expand Up @@ -13,10 +13,10 @@ insert_final_newline = true
trim_trailing_whitespace = false
insert_final_newline = false

[test/**]
[**/{actual,fixtures,expected}/**]
trim_trailing_whitespace = false
insert_final_newline = false

[templates/**]
[**/templates/**]
trim_trailing_whitespace = false
insert_final_newline = false
7 changes: 2 additions & 5 deletions .eslintrc → .eslintrc.json
Expand Up @@ -34,6 +34,7 @@
"handle-callback-err": [2, "^(err|error)$" ],
"indent": [2, 2, { "SwitchCase": 1 }],
"key-spacing": [2, { "beforeColon": false, "afterColon": true }],
"keyword-spacing": [2, { "before": true, "after": true }],
"new-cap": [2, { "newIsCap": true, "capIsNew": false }],
"new-parens": 2,
"no-array-constructor": 2,
Expand All @@ -49,7 +50,6 @@
"no-dupe-keys": 2,
"no-duplicate-case": 2,
"no-empty-character-class": 2,
"no-empty-label": 2,
"no-eval": 2,
"no-ex-assign": 2,
"no-extend-native": 2,
Expand All @@ -71,7 +71,7 @@
"no-multi-spaces": 2,
"no-multi-str": 2,
"no-multiple-empty-lines": [2, { "max": 1 }],
"no-native-reassign": 2,
"no-native-reassign": 0,
"no-negated-in-lhs": 2,
"no-new": 2,
"no-new-func": 2,
Expand Down Expand Up @@ -108,13 +108,10 @@
"radix": 2,
"semi": [2, "always"],
"semi-spacing": [2, { "before": false, "after": true }],
"space-after-keywords": [2, "always"],
"space-before-blocks": [2, "always"],
"space-before-function-paren": [2, "never"],
"space-before-keywords": [2, "always"],
"space-in-parens": [2, "never"],
"space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, { "words": true, "nonwords": false }],
"spaced-comment": [0, "always", { "markers": ["global", "globals", "eslint", "eslint-disable", "*package", "!", ","] }],
"use-isnan": 2,
Expand Down
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015, Jon Schlinkert.
Copyright (c) 2015-2016, 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 b7bd0aa

Please sign in to comment.