Skip to content

Commit

Permalink
Merge bc8f4b6 into 4a8baf6
Browse files Browse the repository at this point in the history
  • Loading branch information
eddywashere committed Sep 27, 2016
2 parents 4a8baf6 + bc8f4b6 commit 001fe74
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
7 changes: 1 addition & 6 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
{
"presets": ["es2015", "stage-0", "react"],
"env": {
"test": {
"plugins": [ "istanbul" ]
}
}
"presets": ["es2015", "stage-0", "react"]
}
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ node_js:
cache:
directories:
- node_modules
before_install:
- npm install -g npm@latest
before_script:
- chmod +x scripts/docs
script:
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@
"babel-cli": "^6.11.4",
"babel-core": "^6.13.2",
"babel-loader": "^6.2.2",
"babel-plugin-istanbul": "^2.0.0",
"babel-polyfill": "^6.13.0",
"babel-preset-es2015": "^6.13.2",
"babel-preset-react": "^6.5.0",
Expand Down

0 comments on commit 001fe74

Please sign in to comment.