Skip to content
This repository has been archived by the owner on Jan 14, 2019. It is now read-only.

Commit

Permalink
Merge f5a6ac6 into 4891eb5
Browse files Browse the repository at this point in the history
  • Loading branch information
greenkeeper[bot] committed Oct 31, 2018
2 parents 4891eb5 + f5a6ac6 commit 84be795
Show file tree
Hide file tree
Showing 3 changed files with 317 additions and 687 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ If a component has a prop that collides with a context-passed-through prop, the

### Full Example

[![Edit react-connect-context demo](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/p9rv0rp59m)
[![Edit react-connect-context demo](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/p9rv0rp59m) [![Greenkeeper badge](https://badges.greenkeeper.io/contiamo/react-connect-context.svg)](https://greenkeeper.io/)

```jsx
import React from "react"
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
"prepublish": "jest && npm run build"
},
"devDependencies": {
"@types/jest": "^22.2.3",
"@types/jest": "^23.3.9",
"@types/react": "^16.3.13",
"@types/react-dom": "^16.0.5",
"@types/react-test-renderer": "^16.0.1",
"coveralls": "^3.0.0",
"jest": "^22.4.0",
"jest": "^23.6.0",
"react-test-renderer": "^16.3.0-alpha.1",
"regenerator-runtime": "^0.11.1",
"regenerator-runtime": "^0.12.1",
"rimraf": "^2.6.2",
"ts-jest": "^22.4.4",
"typescript": "^2.8.3"
"ts-jest": "^23.10.4",
"typescript": "^3.1.4"
},
"jest": {
"moduleFileExtensions": [
Expand Down

0 comments on commit 84be795

Please sign in to comment.