Skip to content

Commit

Permalink
Merge branch 'master' into renovate/eslint-7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
toshi-toma committed Jun 25, 2020
2 parents 6a24768 + a207df3 commit d782b7f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"typescript": ">=3.3.1 <3.10.0"
},
"devDependencies": {
"@types/react": "16.9.38",
"@types/react": "16.9.41",
"eslint": "7.3.1",
"prettier": "2.0.5",
"react": "16.13.1",
Expand Down

0 comments on commit d782b7f

Please sign in to comment.