diff options
| author | laurawilsonri <laura_wilson@brown.edu> | 2019-03-18 18:29:10 -0400 |
|---|---|---|
| committer | laurawilsonri <laura_wilson@brown.edu> | 2019-03-18 18:29:10 -0400 |
| commit | 670cf766c99a8a5de806fd7d6f1d9e357a55071a (patch) | |
| tree | d47353942ebc8b2ae3c3416e73d119bf7e39ffae /package.json | |
| parent | 9d939c1190ef86e456cf26e9f5cb84743279f7a6 (diff) | |
not sure
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/package.json b/package.json index 640f16437..a4a328859 100644 --- a/package.json +++ b/package.json @@ -38,13 +38,10 @@ "@fortawesome/free-solid-svg-icons": "^5.7.2", "@fortawesome/react-fontawesome": "^0.1.4", "@hig/flyout": "^1.0.3", -<<<<<<< HEAD "@trendmicro/react-dropdown": "^1.3.0", -======= "@types/async": "^2.4.1", "@hig/theme-context": "^2.1.3", "@hig/theme-data": "^2.3.3", ->>>>>>> f70ad315167b714f11f7d68f35a46abe9e525a4d "@types/bcrypt-nodejs": "0.0.30", "@types/bluebird": "^3.5.25", "@types/body-parser": "^1.17.0", @@ -92,11 +89,8 @@ "bcrypt-nodejs": "0.0.3", "bluebird": "^3.5.3", "body-parser": "^1.18.3", -<<<<<<< HEAD "bootstrap": "^4.3.1", -======= "connect-flash": "^0.1.1", ->>>>>>> f70ad315167b714f11f7d68f35a46abe9e525a4d "connect-mongo": "^2.0.3", "cookie-parser": "^1.4.4", "cookie-session": "^2.0.0-beta.3", |