diff options
| author | mehekj <mehek.jethani@gmail.com> | 2022-08-24 20:23:09 -0400 |
|---|---|---|
| committer | mehekj <mehek.jethani@gmail.com> | 2022-08-24 20:23:09 -0400 |
| commit | 31ca85d11a5735f6e74e4a887f99a9c12c35d0a7 (patch) | |
| tree | 63d3f329fc0f82b4cb7df8c8bd09c5ebcee54ba1 /package.json | |
| parent | 02fe10d4a15cb5f72f77da88dc7e1fa4b39346c5 (diff) | |
resolving conflict to merge
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/package.json b/package.json index 64d75b3b1..ccbc73a79 100644 --- a/package.json +++ b/package.json @@ -75,6 +75,7 @@ "@types/react-measure": "^2.0.8", "@types/react-reconciler": "^0.26.4", "@types/react-select": "^3.1.2", + "@types/react-table": "^6.8.9", "@types/react-transition-group": "^4.4.5", "@types/request": "^2.48.8", "@types/request-promise": "^4.1.48", @@ -83,6 +84,7 @@ "@types/shelljs": "^0.8.11", "@types/socket.io": "^2.1.13", "@types/socket.io-client": "^1.4.36", + "@types/socket.io-parser": "^3.0.0", "@types/typescript": "^2.0.0", "@types/uuid": "^3.4.10", "@types/valid-url": "^1.0.3", @@ -136,6 +138,7 @@ "@hig/theme-context": "^2.1.3", "@hig/theme-data": "^2.23.1", "@material-ui/core": "^4.12.3", + "@octokit/core": "^4.0.4", "@react-google-maps/api": "^2.7.0", "@react-three/fiber": "^6.2.3", "@types/bezier-js": "^4.1.0", @@ -271,14 +274,18 @@ "react-icons": "^4.3.1", "react-jsx-parser": "^1.29.0", "react-loading": "^2.0.3", + "react-markdown": "^8.0.3", "react-measure": "^2.5.2", "react-refresh-typescript": "^2.0.7", "react-resizable": "^1.11.1", "react-resizable-rotatable-draggable": "^0.2.0", "react-reveal": "^1.2.2", "react-select": "^3.2.0", + "react-table": "^6.11.5", "react-transition-group": "^4.4.2", "readline": "^1.3.0", + "rehype-raw": "^6.1.1", + "remark-gfm": "^3.0.1", "request": "^2.88.2", "request-promise": "^4.2.6", "reveal.js": "^4.3.0", |