diff options
| author | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2022-04-28 17:31:27 -0400 |
|---|---|---|
| committer | Michael Foiani <sotech117@michaels-mbp-3.devices.brown.edu> | 2022-04-28 17:31:27 -0400 |
| commit | 813ac366831c95f3fa11e01b9588cf18cbe466bc (patch) | |
| tree | 24a98e427543ff57c9396918ff12ae1cf81a5a92 /package.json | |
| parent | f8503355ff82930e640369637c33d989fd7eaff3 (diff) | |
| parent | 22fe2791b6a6e92cc4d0ad953363120b51bd6e2c (diff) | |
Handle merge conflicts with jenny work
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/package.json b/package.json index 71f56e3ce..6185bc0d7 100644 --- a/package.json +++ b/package.json @@ -132,6 +132,7 @@ "@types/dom-speech-recognition": "0.0.1", "@types/formidable": "1.0.31", "@types/google-maps": "^3.2.3", + "@types/react-icons": "^3.0.0", "@types/react-reconciler": "^0.26.4", "@types/reveal": "^3.3.33", "@types/supercluster": "^7.1.0", @@ -139,6 +140,7 @@ "@types/web": "0.0.53", "@types/webscopeio__react-textarea-autocomplete": "^4.7.2", "@webscopeio/react-textarea-autocomplete": "^4.9.1", + "D": "^1.0.0", "adm-zip": "^0.4.16", "archiver": "^3.1.1", "array-batcher": "^1.2.3", @@ -164,7 +166,6 @@ "cookie-parser": "^1.4.6", "cookie-session": "^2.0.0", "cors": "^2.8.5", - "D": "^1.0.0", "depcheck": "^0.9.2", "equation-editor-react": "github:bobzel/equation-editor-react#useLocally", "exif": "^0.6.0", @@ -174,6 +175,7 @@ "express-session": "^1.17.2", "express-validator": "^5.3.1", "expressjs": "^1.0.1", + "ffmpeg": "0.0.4", "file-saver": "^2.0.5", "find-in-files": "^0.5.0", "fit-curve": "^0.1.7", @@ -253,6 +255,7 @@ "react-datepicker": "^3.8.0", "react-dom": "^16.14.0", "react-grid-layout": "^0.18.3", + "react-icons": "^4.3.1", "react-image-lightbox-with-rotate": "^5.1.1", "react-jsx-parser": "^1.29.0", "react-loading": "^2.0.3", @@ -262,7 +265,7 @@ "react-resizable-rotatable-draggable": "^0.2.0", "react-reveal": "^1.2.2", "react-select": "^3.2.0", - "react-table": "^7.7.0", + "react-table": "^6.11.5", "readline": "^1.3.0", "request": "^2.88.2", "request-promise": "^4.2.6", |