fix: resovle conflicts

1 files changed, 11 insertions, 9 deletions

diff --git a/package.json b/package.json
index 0ace916..b57298f 100644
--- a/package.json
+++ b/package.json
@@ -1,25 +1,21 @@
 {
   "name": "which",
   "version": "0.1.0",
-  "private": true,
+  "homepage": "https://ilyayudovin.github.io/which",
   "dependencies": {
     "@material-ui/core": "^4.10.1",
     "@material-ui/icons": "^4.9.1",
-    "@types/node": "^12.12.44",
-    "@types/react": "^16.9.35",
-    "@types/react-dom": "^16.9.8",
-    "eslint-config-airbnb-typescript": "^8.0.2",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-scripts": "3.4.1",
-    "typeface-roboto": "0.0.75",
-    "typescript": "^3.7.5"
+    "typeface-roboto": "0.0.75"
   },
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
     "lint": "eslint . --ext ts,tsx --max-warnings 0",
-    "test": "npm run lint"
+    "test": "npm run lint",
+    "deploy": "gh-pages --dist build"
   },
   "browserslist": {
     "production": [
@@ -34,13 +30,19 @@
     ]
   },
   "devDependencies": {
+    "@types/node": "^12.12.44",
+    "@types/react": "^16.9.35",
+    "@types/react-dom": "^16.9.8",
     "@typescript-eslint/eslint-plugin": "^3.1.0",
     "@typescript-eslint/parser": "^3.1.0",
     "eslint": "^6.8.0",
     "eslint-config-airbnb": "^18.1.0",
+    "eslint-config-airbnb-typescript": "^8.0.2",
     "eslint-plugin-import": "^2.20.2",
     "eslint-plugin-jsx-a11y": "^6.2.3",
     "eslint-plugin-react": "^7.20.0",
-    "eslint-plugin-react-hooks": "^2.5.1"
+    "eslint-plugin-react-hooks": "^2.5.1",
+    "gh-pages": "^3.0.0",
+    "typescript": "^3.9.5"
   }
 }