Merge conflicts

Author: kwhitaker

README.md

@@ -139,5 +139,5 @@ MIT
  [npm-url]: https://npmjs.org/package/@use-hooks/axios
  [download-image]: https://img.shields.io/npm/dm/@use-hooks/axios.svg?style=flat-square
  [download-url]: https://npmjs.org/package/@use-hooks/axios
- [travis-url]: https://travis-ci.com/use-hooks/react-hooks-axios
- [travis-image]: https://img.shields.io/travis/com/use-hooks/react-hooks-axios.svg?style=flat-square
+ [travis-url]: https://travis-ci.org/use-hooks/react-hooks-axios
+ [travis-image]: https://img.shields.io/travis/use-hooks/react-hooks-axios.svg?style=flat-square

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@use-hooks/axios",
-  "version": "1.2.0",
+  "version": "1.2.2",
   "description": "Custom React Hooks for Axios.js",
   "main": "dist/index.js",
   "types": "types.d.ts",
@@ -78,7 +78,7 @@
     ]
   },
   "dependencies": {
-    "axios": "^0.18.0",
+    "axios": "^0.19.0",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },

package.json

@@ -1,7 +1,7 @@
 import { AxiosRequestConfig, AxiosResponse, AxiosInstance } from 'axios';
 
 export interface IParams {
-    axios: AxiosInstance;
+    axios?: AxiosInstance;
     url: string;
     method?: 'GET' | 'POST' | 'PUT' | 'DELETE' | 'HEAD' | 'OPTIONS' | 'PATCH';
     options?: AxiosRequestConfig;