Resolved master conflicts

quguoliang · Dec 31, 2019 · 7dc3e72 · 7dc3e72
2 parents 3943b85 + c6e4e5f
commit 7dc3e72
Show file tree

Hide file tree

Showing 4 changed files with 4,933 additions and 2,700 deletions.
diff --git a/README.md b/README.md
@@ -74,7 +74,7 @@ const store = init({
 export default store
 ```
 
-_For a more advanced setup, see_ [_plugins_](https://github.com/rematch/rematch/tree/e4fe17537a947bbe8a9faf1e0e77099beb7fef91/docs/plugins.md) _and_ [_Redux config options_](api-reference/reduxapi.md)_._
+_For a more advanced setup, see_ [_plugins_](https://github.com/rematch/rematch/tree/e4fe17537a947bbe8a9faf1e0e77099beb7fef91/docs/plugins.md) _and_ [_Redux config options_](docs/api-reference/reduxapi.md)_._
 
 #### Step 2: Models
 

diff --git a/examples/react/count/package-lock.json b/examples/react/count/package-lock.json