Skip to content

Commit

Permalink
Merge branch 'master' into chore/babel-to-babel-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
pgoldrbx committed Dec 11, 2018
2 parents 13d659e + b52c2d8 commit 0542e4e
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .babelrc
@@ -1,6 +1,6 @@
{
"presets": [
"es2015",
"env",
"react"
]
}
34 changes: 17 additions & 17 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions package.json
Expand Up @@ -31,8 +31,7 @@
},
"devDependencies": {
"babel-cli": "^6.26.0",
"babel-preset-env": "^1.6.1",
"babel-preset-es2015": "^6.24.1",
"babel-preset-env": "^1.7.0",
"babel-preset-es2015-rollup": "^3.0.0",
"babel-preset-react": "^6.24.1",
"babel-register": "^6.26.0",
Expand Down

0 comments on commit 0542e4e

Please sign in to comment.